Revert "drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix"
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 10 Nov 2022 14:13:50 +0000 (09:13 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 20 Dec 2022 17:47:04 +0000 (12:47 -0500)
This reverts commit e5d59cfa330523e47cba62a496864acc3948fc27.

This is no longer needed since we no longer suspend SDMA during
S0ix.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

index 809eca5..65e7a71 100644 (file)
@@ -809,12 +809,6 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
                        msleep(1000);
        }
 
-       /* TODO: check whether can submit a doorbell request to raise
-        * a doorbell fence to exit gfxoff.
-        */
-       if (adev->in_s0ix)
-               amdgpu_gfx_off_ctrl(adev, false);
-
        sdma_v5_2_soft_reset(adev);
        /* unhalt the MEs */
        sdma_v5_2_enable(adev, true);
@@ -823,8 +817,6 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
 
        /* start the gfx rings and rlc compute queues */
        r = sdma_v5_2_gfx_resume(adev);
-       if (adev->in_s0ix)
-               amdgpu_gfx_off_ctrl(adev, true);
        if (r)
                return r;
        r = sdma_v5_2_rlc_resume(adev);