Skip to content

Commit 54037bd

Browse files
committed
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 <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent ef8d147 commit 54037bd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ static int psp_v12_0_ring_init(struct psp_context *psp,
243243
struct psp_ring *ring;
244244
struct amdgpu_device *adev = psp->adev;
245245

246-
psp_v12_0_reroute_ih(psp);
247-
248246
ring = &psp->km_ring;
249247

250248
ring->ring_type = ring_type;
@@ -272,6 +270,8 @@ static int psp_v12_0_ring_create(struct psp_context *psp,
272270
struct psp_ring *ring = &psp->km_ring;
273271
struct amdgpu_device *adev = psp->adev;
274272

273+
psp_v12_0_reroute_ih(psp);
274+
275275
if (amdgpu_sriov_vf(psp->adev)) {
276276
/* Write low address of the ring to C2PMSG_102 */
277277
psp_ring_reg = lower_32_bits(ring->ring_mem_mc_addr);

0 commit comments

Comments
 (0)