diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2022-11-16 10:56:31 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2022-11-17 18:09:11 -0500 |
commit | 54037bdfb1feca4688754fc77f9f7152b77729fa (patch) | |
tree | c1dd7487315904b6ce02154362a4ceb0b05fcf8f /drivers/gpu | |
parent | ef8d147fd4425b1c46ad8f2df567632b6c5897e1 (diff) | |
download | linux-54037bdfb1feca4688754fc77f9f7152b77729fa.tar.gz linux-54037bdfb1feca4688754fc77f9f7152b77729fa.tar.bz2 linux-54037bdfb1feca4688754fc77f9f7152b77729fa.zip |
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 <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |