Skip to content

Commit

Permalink
drm/amdgpu/psp12: move ih_reroute into ring_create
Browse files Browse the repository at this point in the history
This matches what we do for psp 3.1 and makes ring_init
common for all PSP versions.

Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Alex Deucher committed Nov 17, 2022
1 parent ef8d147 commit 54037bd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 54037bd

Please sign in to comment.