diff options
| author | Leo Liu <leo.liu@amd.com> | 2019-07-12 09:47:44 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2019-07-29 17:52:58 -0400 |
| commit | 8d7f2e22217ee64be88cb09a946b61f3b1ef9ac1 (patch) | |
| tree | aa30d99bb3ec2267bdcb2ffe3207a39694a9362e | |
| parent | a43986391839ef1a7d83c56ed60592372293ded6 (diff) | |
radeon/vcn/vp9: add Arcturus VP9 support
Arcturus CHIP enum is less than Navi10, since it's still gfx9,
but its VCN version belongs to VCN2.x
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vcn_dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c index 58214697aa9..77bfe187674 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c @@ -840,7 +840,7 @@ static struct pb_buffer *rvcn_dec_message_decode(struct radeon_decoder *dec, decode->sc_coeff_size = 0; decode->sw_ctxt_size = RDECODE_SESSION_CONTEXT_SIZE; - decode->db_pitch = (((struct si_screen*)dec->screen)->info.family >= CHIP_NAVI10 && + decode->db_pitch = (((struct si_screen*)dec->screen)->info.family >= CHIP_ARCTURUS && dec->base.width > 32 && dec->stream_type == RDECODE_CODEC_VP9) ? align(dec->base.width, 64) : align(dec->base.width, 32) ; @@ -938,7 +938,7 @@ static struct pb_buffer *rvcn_dec_message_decode(struct radeon_decoder *dec, /* default probability + probability data */ ctx_size = 2304 * 5; - if (((struct si_screen*)dec->screen)->info.family >= CHIP_NAVI10) { + if (((struct si_screen*)dec->screen)->info.family >= CHIP_ARCTURUS) { /* SRE collocated context data */ ctx_size += 32 * 2 * 128 * 68; /* SMP collocated context data */ @@ -1263,7 +1263,7 @@ static unsigned calc_dpb_size(struct radeon_decoder *dec) case PIPE_VIDEO_FORMAT_VP9: max_references = MAX2(max_references, 9); - dpb_size = (((struct si_screen*)dec->screen)->info.family >= CHIP_NAVI10) ? + dpb_size = (((struct si_screen*)dec->screen)->info.family >= CHIP_ARCTURUS) ? (8192 * 4320 * 3 / 2) * max_references : (4096 * 3000 * 3 / 2) * max_references; |