diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
| commit | 2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch) | |
| tree | 75cd2329b7e737865bf28ea734a2e0649c02a5bf /drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | |
| parent | 86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff) | |
| parent | 72fa02fdf83306c52bc1eede28359e3fa32a151a (diff) | |
| download | linux-2f910859724b53f1cd3579246e3d9bebb16d78b8.tar.xz | |
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c index b9674c57c436..6ddc8e3360e2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -723,8 +723,15 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) if (adev->gfx.gfx_off_req_count == 0 && !adev->gfx.gfx_off_state) { - schedule_delayed_work(&adev->gfx.gfx_off_delay_work, + /* If going to s2idle, no need to wait */ + if (adev->in_s0ix) { + if (!amdgpu_dpm_set_powergating_by_smu(adev, + AMD_IP_BLOCK_TYPE_GFX, true)) + adev->gfx.gfx_off_state = true; + } else { + schedule_delayed_work(&adev->gfx.gfx_off_delay_work, delay); + } } } else { if (adev->gfx.gfx_off_req_count == 0) { |