Mesa (master): radeon/vcn: fix jpeg decode for navi10

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0f8ef37f653bbb1fffa6813697e2ffe21dae2016
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f8ef37f653bbb1fffa6813697e2ffe21dae2016

Author: Thong Thai <thong.thai at amd.com>
Date:   Sun Aug  9 11:13:57 2020 -0400

radeon/vcn: fix jpeg decode for navi10

Fixes an issue where the JPEG decode would timeout when decoding certain JPEG files.

Signed-off-by: Thong Thai <thong.thai at amd.com>
Reviewed-by: Boyuan Zhang <boyuan.zhang at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6249>

---

 src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c b/src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c
index e153436f1d7..edf03d77682 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c
@@ -260,7 +260,7 @@ static void send_cmd_target_direct(struct radeon_decoder *dec, struct pb_buffer
    set_reg_jpeg(dec, vcnipUVD_JPEG_INT_EN, COND0, TYPE0, 0xFFFFFFFE);
 
    // start engine command
-   set_reg_jpeg(dec, vcnipUVD_JPEG_CNTL, COND0, TYPE0, 0xE);
+   set_reg_jpeg(dec, vcnipUVD_JPEG_CNTL, COND0, TYPE0, 0x6);
 
    // wait for job completion, wait for job JBSI fetch done
    set_reg_jpeg(dec, vcnipUVD_JRBC_IB_REF_DATA, COND0, TYPE0, (dec->jpg.bsd_size >> 2));