radeon/vcn: increase render_pic_list size
Increase the maximum number of possible decoder reference picture
frames from 16 to 32.
Signed-off-by: Thong Thai <thong.thai@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6016>
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c
index 6bc6006..3854fad 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -256,17 +256,19 @@
result.num_delta_pocs_ref_rps_idx = pic->NumDeltaPocsOfRefRpsIdx;
result.curr_poc = pic->CurrPicOrderCntVal;
- for (i = 0; i < 16; i++) {
- for (j = 0; (pic->ref[j] != NULL) && (j < 16); j++) {
+ for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) {
+ for (j = 0;
+ (pic->ref[j] != NULL) && (j < ARRAY_SIZE(dec->render_pic_list));
+ j++) {
if (dec->render_pic_list[i] == pic->ref[j])
break;
- if (j == 15)
+ if (j == ARRAY_SIZE(dec->render_pic_list) - 1)
dec->render_pic_list[i] = NULL;
else if (pic->ref[j + 1] == NULL)
dec->render_pic_list[i] = NULL;
}
}
- for (i = 0; i < 16; i++) {
+ for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) {
if (dec->render_pic_list[i] == NULL) {
dec->render_pic_list[i] = target;
result.curr_idx = i;
@@ -482,9 +484,9 @@
result.uncompressed_header_size = pic->picture_parameter.frame_header_length_in_bytes;
result.compressed_header_size = pic->picture_parameter.first_partition_size;
- assert(dec->base.max_references + 1 <= 16);
+ assert(dec->base.max_references + 1 <= ARRAY_SIZE(dec->render_pic_list));
- for (i = 0; i < 16; ++i) {
+ for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); ++i) {
if (dec->render_pic_list[i] && dec->render_pic_list[i] == target) {
result.curr_pic_idx = (uintptr_t)vl_video_buffer_get_associated_data(target, &dec->base);
break;
@@ -1504,7 +1506,7 @@
goto error;
}
- for (i = 0; i < 16; i++)
+ for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++)
dec->render_pic_list[i] = NULL;
bs_buf_size = width * height * (512 / (16 * 16));
for (i = 0; i < NUM_BUFFERS; ++i) {
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h b/src/gallium/drivers/radeon/radeon_vcn_dec.h
index 00c373a..839dc25 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.h
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.h
@@ -781,7 +781,7 @@
unsigned bs_size;
unsigned cur_buffer;
- void *render_pic_list[16];
+ void *render_pic_list[32];
bool show_frame;
unsigned ref_idx;
struct {
