Commit 8d80b293 authored by Yinjie Yao's avatar Yinjie Yao Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: set no_user_fence for VCN v2.0 enc/dec rings 



VCN encoder and decoder rings do not support 64-bit user fence writes,
reject CS submissions with user fences.

Fixes: 1b61de45 ("drm/amdgpu: add initial VCN2.0 support (v2)")
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 e2b5499fca55f1a32960a311bbb62e35891eaf73)
parent 31bc64e8

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

+2 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,7 @@ static const struct amd_ip_funcs vcn_v2_0_ip_funcs = { 
static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = {

	.type = AMDGPU_RING_TYPE_VCN_DEC,

	.align_mask = 0xf,

	.no_user_fence = true,

	.secure_submission_supported = true,

	.get_rptr = vcn_v2_0_dec_ring_get_rptr,

	.get_wptr = vcn_v2_0_dec_ring_get_wptr,
@@ -2145,6 +2146,7 @@ static const struct amdgpu_ring_funcs vcn_v2_0_enc_ring_vm_funcs = { 
	.type = AMDGPU_RING_TYPE_VCN_ENC,

	.align_mask = 0x3f,

	.nop = VCN_ENC_CMD_NO_OP,

	.no_user_fence = true,

	.get_rptr = vcn_v2_0_enc_ring_get_rptr,

	.get_wptr = vcn_v2_0_enc_ring_get_wptr,

	.set_wptr = vcn_v2_0_enc_ring_set_wptr,