diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-04 13:18:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-04 13:18:55 +1000 |
| commit | 7eb3848cc8c17a822f4cced5da0aa437e0063097 (patch) | |
| tree | e98c7976b768348747379d10153ba35c85e1e698 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | 26291c54e111ff6ba87a164d85d4a4e134b7315c (diff) | |
| parent | e8ae38720e1a685fd98cfa5ae118c9d07b45ca79 (diff) | |
| download | linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.tar.gz linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.tar.bz2 linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.zip | |
Merge tag 'amd-drm-fixes-5.17-2022-02-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.17-2022-02-02:
amdgpu:
- mGPU fan boost fix for beige goby
- S0ix fixes
- Cyan skillfish hang fix
- DCN fixes for DCN 3.1
- DCN fixes for DCN 3.01
- Apple retina panel fix
- ttm logic inversion fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220203035224.5801-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 4c83f1db8a24..63a089992645 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2246,13 +2246,20 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) static int amdgpu_pmops_prepare(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); + struct amdgpu_device *adev = drm_to_adev(drm_dev); /* Return a positive number here so * DPM_FLAG_SMART_SUSPEND works properly */ if (amdgpu_device_supports_boco(drm_dev)) - return pm_runtime_suspended(dev) && - pm_suspend_via_firmware(); + return pm_runtime_suspended(dev); + + /* if we will not support s3 or s2i for the device + * then skip suspend + */ + if (!amdgpu_acpi_is_s0ix_active(adev) && + !amdgpu_acpi_is_s3_active(adev)) + return 1; return 0; } |