Commit 79405e77 authored by Yinjie Yao's avatar Yinjie Yao Committed by Alex Deucher
Browse files

drm/amdgpu/jpeg: set no_user_fence for JPEG v2.5 ring 



JPEG rings do not support 64-bit user fence writes, reject CS
submissions with user fences.

Fixes: 14f43e8f ("drm/amdgpu: move JPEG2.5 out from VCN2.5")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarYinjie Yao <yinjie.yao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3216a7f4e2642bda5fd14f57586e835ae9202587)
parent e5f612dc

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

+2 −0
Original line number Diff line number Diff line
@@ -693,6 +693,7 @@ static const struct amd_ip_funcs jpeg_v2_6_ip_funcs = { 
static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = {

	.type = AMDGPU_RING_TYPE_VCN_JPEG,

	.align_mask = 0xf,

	.no_user_fence = true,

	.get_rptr = jpeg_v2_5_dec_ring_get_rptr,

	.get_wptr = jpeg_v2_5_dec_ring_get_wptr,

	.set_wptr = jpeg_v2_5_dec_ring_set_wptr,
@@ -724,6 +725,7 @@ static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = { 
static const struct amdgpu_ring_funcs jpeg_v2_6_dec_ring_vm_funcs = {

	.type = AMDGPU_RING_TYPE_VCN_JPEG,

	.align_mask = 0xf,

	.no_user_fence = true,

	.get_rptr = jpeg_v2_5_dec_ring_get_rptr,

	.get_wptr = jpeg_v2_5_dec_ring_get_wptr,

	.set_wptr = jpeg_v2_5_dec_ring_set_wptr,