Commit 8c0f11ff authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: only allow secure submission on rings which support that 



Only GFX ring, SDMA ring and VCN decode ring support secure submission
at the moment.

Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8476269f

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

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	}



	if ((ib->flags & AMDGPU_IB_FLAGS_SECURE) &&

	    (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE)) {

		dev_err(adev->dev, "secure submissions not supported on compute rings\n");

	    (!ring->funcs->secure_submission_supported)) {

		dev_err(adev->dev, "secure submissions not supported on ring <%s>\n", ring->name);

		return -EINVAL;

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct amdgpu_ring_funcs { 
	u32			nop;

	bool			support_64bit_ptrs;

	bool			no_user_fence;

	bool			secure_submission_supported;

	unsigned		vmhub;

	unsigned		extra_dw;

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

+1 −0
Original line number Diff line number Diff line
@@ -9377,6 +9377,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { 
	.align_mask = 0xff,

	.nop = PACKET3(PACKET3_NOP, 0x3FFF),

	.support_64bit_ptrs = true,

	.secure_submission_supported = true,

	.vmhub = AMDGPU_GFXHUB_0,

	.get_rptr = gfx_v10_0_ring_get_rptr_gfx,

	.get_wptr = gfx_v10_0_ring_get_wptr_gfx,

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

+1 −0
Original line number Diff line number Diff line
@@ -6865,6 +6865,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { 
	.align_mask = 0xff,

	.nop = PACKET3(PACKET3_NOP, 0x3FFF),

	.support_64bit_ptrs = true,

	.secure_submission_supported = true,

	.vmhub = AMDGPU_GFXHUB_0,

	.get_rptr = gfx_v9_0_ring_get_rptr_gfx,

	.get_wptr = gfx_v9_0_ring_get_wptr_gfx,

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

+1 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ static const struct amdgpu_ring_funcs sdma_v2_4_ring_funcs = { 
	.align_mask = 0xf,

	.nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP),

	.support_64bit_ptrs = false,

	.secure_submission_supported = true,

	.get_rptr = sdma_v2_4_ring_get_rptr,

	.get_wptr = sdma_v2_4_ring_get_wptr,

	.set_wptr = sdma_v2_4_ring_set_wptr,