AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "radeonsi/vcn: Stop using stream handle for decode"

Browse Source 
Caused issues on VCN5.

This reverts commit 46d5926d83.

Fixes: 46d5926d83 ("radeonsi/vcn: Stop using stream handle for decode")
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36154>
This commit is contained in:
David Rosca
2025-07-16 07:52:26 +02:00
committed by Marge Bot
parent 8d61c2751f
commit bc11dc72c1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View File

@@ -1309,6 +1309,7 @@ static void rvcn_dec_message_create(struct radeon_decoder *dec)
header->total_size = sizes;
header->num_buffers = 1;
header->msg_type = RDECODE_MSG_CREATE;
header->stream_handle = dec->stream_handle;
header->status_report_feedback_number = 0;
header->index[0].message_id = RDECODE_MESSAGE_CREATE;
@@ -1556,6 +1557,7 @@ static struct pb_buffer_lean *rvcn_dec_message_decode(struct radeon_decoder *dec
header->header_size = sizeof(rvcn_dec_message_header_t);
header->total_size = sizes;
header->msg_type = RDECODE_MSG_DECODE;
header->stream_handle = dec->stream_handle;
header->status_report_feedback_number = dec->frame_number;
header->index[0].message_id = RDECODE_MESSAGE_DECODE;
@@ -1937,6 +1939,7 @@ static void rvcn_dec_message_destroy(struct radeon_decoder *dec)
header->total_size = sizeof(rvcn_dec_message_header_t) - sizeof(rvcn_dec_message_index_t);
header->num_buffers = 0;
header->msg_type = RDECODE_MSG_DESTROY;
header->stream_handle = dec->stream_handle;
header->status_report_feedback_number = 0;
}
@@ -2817,6 +2820,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
dec->base.destroy_fence = radeon_dec_destroy_fence;
dec->stream_type = stream_type;
dec->stream_handle = si_vid_alloc_stream_handle();
dec->screen = context->screen;
dec->ws = ws;

1
src/gallium/drivers/radeonsi/radeon_vcn_dec.h
View File

@@ -66,6 +66,7 @@ struct jpeg_registers {
struct radeon_decoder {
struct pipe_video_codec base;
unsigned stream_handle;
unsigned stream_type;
unsigned frame_number;
unsigned db_alignment;