]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amdgpu: fix runpm logic in amdgpu_pmops_resume
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 7 May 2020 14:04:04 +0000 (10:04 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 8 May 2020 18:33:27 +0000 (14:33 -0400)
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 <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index 959abd0e38d590c43ababaf8ed68446fae394d3d..9f9758699cb9dd9665af11626c96d2301c42b8bf 100644 (file)
@@ -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);