diff --git a/.pick_status.json b/.pick_status.json index 2149fc47e16..eebbd212f5b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5184,7 +5184,7 @@ "description": "radeonsi/vcn: Enable AV1 decode workaround for gfx1153", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index ab48acdac65..a145ae71e4a 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -715,6 +715,7 @@ static rvcn_dec_message_av1_t get_av1_msg(struct radeon_decoder *dec, struct pipe_video_buffer *target, struct pipe_av1_picture_desc *pic) { + struct si_screen *sscreen = (struct si_screen *)dec->screen; rvcn_dec_message_av1_t result; unsigned i, j, num_refs = 0, valid_ref = UINT32_MAX; uint16_t tile_count = pic->picture_parameter.tile_cols * pic->picture_parameter.tile_rows; @@ -1093,6 +1094,8 @@ static rvcn_dec_message_av1_t get_av1_msg(struct radeon_decoder *dec, } } + result.av1_intrabc_workaround = sscreen->info.family == CHIP_GFX1153; + return result; }