drm/amdgpu: Stop clearing kiq position during unload

Do not clear kiq position in RLC_CP_SCHEDULER so that CP could perform
IDLE-SAVE after VF fini. CPG also needs to be active in save command.

v2: drop unused variable (Alex)

Signed-off-by: YuBiao Wang <YuBiao.Wang@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 9447999a3a487030709aa1b1b9f0212d225e0642..9d2c6523f546c13b46e34899f08cd4bee37000b0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -4392,7 +4392,6 @@ static int gfx_v11_0_hw_fini(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        int r;
-       uint32_t tmp;
 
        amdgpu_irq_put(adev, &adev->gfx.priv_reg_irq, 0);
        amdgpu_irq_put(adev, &adev->gfx.priv_inst_irq, 0);
@@ -4411,15 +4410,14 @@ static int gfx_v11_0_hw_fini(void *handle)
                amdgpu_mes_kiq_hw_fini(adev);
        }
 
-       if (amdgpu_sriov_vf(adev)) {
-               gfx_v11_0_cp_gfx_enable(adev, false);
-               /* Program KIQ position of RLC_CP_SCHEDULERS during destroy */
-               tmp = RREG32_SOC15(GC, 0, regRLC_CP_SCHEDULERS);
-               tmp &= 0xffffff00;
-               WREG32_SOC15(GC, 0, regRLC_CP_SCHEDULERS, tmp);
-
+       if (amdgpu_sriov_vf(adev))
+               /* Remove the steps disabling CPG and clearing KIQ position,
+                * so that CP could perform IDLE-SAVE during switch. Those
+                * steps are necessary to avoid a DMAR error in gfx9 but it is
+                * not reproduced on gfx11.
+                */
                return 0;
-       }
+
        gfx_v11_0_cp_enable(adev, false);
        gfx_v11_0_enable_gui_idle_interrupt(adev, false);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index 1395453a0662dd728bd790f4f1adf9d8319bd041..8d9c1e8413532ec34c597f2f62cb761b8b274eb5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -1253,7 +1253,9 @@ static int mes_v11_0_kiq_hw_fini(struct amdgpu_device *adev)
        if (adev->mes.ring.sched.ready)
                mes_v11_0_kiq_dequeue_sched(adev);
 
-       mes_v11_0_enable(adev, false);
+       if (!amdgpu_sriov_vf(adev))
+               mes_v11_0_enable(adev, false);
+
        return 0;
 }