From: Alex Deucher Date: Thu, 7 May 2020 14:04:04 +0000 (-0400) Subject: drm/amdgpu: fix runpm logic in amdgpu_pmops_resume X-Git-Tag: baikal/mips/sdk5.9~13559^2~11^2~7 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=a04fda0452ee1ca2f04d07f83acdf1304d320094;p=kernel.git drm/amdgpu: fix runpm logic in amdgpu_pmops_resume We should be checking whether the driver enabled runtime pm rather than whether the asic supports BOCO or BACO. That said in general they are equivalent unless the user has disabled runpm or it has been disabled for a specific asic. Reviewed-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 959abd0e38d59..9f9758699cb9d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1173,10 +1173,10 @@ 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 (amdgpu_device_supports_boco(drm_dev) || - amdgpu_device_supports_baco(drm_dev)) { + if (adev->runpm) { pm_runtime_disable(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev);