Skip to content

Commit 4d96e3c

Browse files
yinjiyao111gregkh
authored andcommitted
drm/amdgpu/jpeg: set no_user_fence for JPEG v2.5 ring
[ Upstream commit 79405e7 ] JPEG rings do not support 64-bit user fence writes, reject CS submissions with user fences. Fixes: 14f43e8 ("drm/amdgpu: move JPEG2.5 out from VCN2.5") Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Yinjie Yao <yinjie.yao@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 3216a7f) Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2e216c2 commit 4d96e3c

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ static const struct amd_ip_funcs jpeg_v2_6_ip_funcs = {
659659
static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = {
660660
.type = AMDGPU_RING_TYPE_VCN_JPEG,
661661
.align_mask = 0xf,
662+
.no_user_fence = true,
662663
.get_rptr = jpeg_v2_5_dec_ring_get_rptr,
663664
.get_wptr = jpeg_v2_5_dec_ring_get_wptr,
664665
.set_wptr = jpeg_v2_5_dec_ring_set_wptr,
@@ -689,6 +690,7 @@ static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = {
689690
static const struct amdgpu_ring_funcs jpeg_v2_6_dec_ring_vm_funcs = {
690691
.type = AMDGPU_RING_TYPE_VCN_JPEG,
691692
.align_mask = 0xf,
693+
.no_user_fence = true,
692694
.get_rptr = jpeg_v2_5_dec_ring_get_rptr,
693695
.get_wptr = jpeg_v2_5_dec_ring_get_wptr,
694696
.set_wptr = jpeg_v2_5_dec_ring_set_wptr,

0 commit comments

Comments
 (0)