From: Alex Deucher Date: Wed, 16 Nov 2022 15:56:31 +0000 (-0500) Subject: drm/amdgpu/psp12: move ih_reroute into ring_create X-Git-Tag: io_uring-6.2-2022-12-19~36^2~14^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=54037bdfb1feca4688754fc77f9f7152b77729fa;p=linux-block.git drm/amdgpu/psp12: move ih_reroute into ring_create This matches what we do for psp 3.1 and makes ring_init common for all PSP versions. Acked-by: Felix Kuehling Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c index 0b2ac418e4ac..d7dd84090c09 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c @@ -243,8 +243,6 @@ static int psp_v12_0_ring_init(struct psp_context *psp, struct psp_ring *ring; struct amdgpu_device *adev = psp->adev; - psp_v12_0_reroute_ih(psp); - ring = &psp->km_ring; ring->ring_type = ring_type; @@ -272,6 +270,8 @@ static int psp_v12_0_ring_create(struct psp_context *psp, struct psp_ring *ring = &psp->km_ring; struct amdgpu_device *adev = psp->adev; + psp_v12_0_reroute_ih(psp); + if (amdgpu_sriov_vf(psp->adev)) { /* Write low address of the ring to C2PMSG_102 */ psp_ring_reg = lower_32_bits(ring->ring_mem_mc_addr);