From: Alex Deucher Date: Thu, 7 May 2020 15:54:49 +0000 (-0400) Subject: drm/amdgpu: drop extra runtime pm handling in resume pmop X-Git-Tag: block-5.8-2020-06-11~21^2~11^2~6 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=af27c649b64778f61522c60f75a06a6e9878d3e2;p=linux-block.git drm/amdgpu: drop extra runtime pm handling in resume pmop The core handles this for us. Acked-by: Evan Quan Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 9f9758699cb9..beb35dd12964 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1173,14 +1173,6 @@ static int amdgpu_pmops_suspend(struct device *dev) static int amdgpu_pmops_resume(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - struct amdgpu_device *adev = drm_dev->dev_private; - - /* GPU comes up enabled by the bios on resume */ - if (adev->runpm) { - pm_runtime_disable(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - } return amdgpu_device_resume(drm_dev, true); }