drm/amdgpu: enable runtime pm on vega10 when noretry=0

The failures with ROCm only happen with noretry=1, so
enable runtime pm when noretry=0 (the current default).

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 0fec39eed164c1e0a0fc3db61d4afa94cd0e22f7..341d072edd95c9210e39cadcae8c0664fd73a712 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -176,7 +176,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
                case CHIP_BONAIRE:
                case CHIP_HAWAII:
 #endif
-               case CHIP_VEGA10:
                case CHIP_VEGA20:
                case CHIP_ARCTURUS:
                case CHIP_SIENNA_CICHLID:
@@ -184,6 +183,11 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
                        if (amdgpu_runtime_pm > 0)
                                adev->runpm = true;
                        break;
+               case CHIP_VEGA10:
+                       /* turn runpm on if noretry=0 */
+                       if (!amdgpu_noretry)
+                               adev->runpm = true;
+                       break;
                default:
                        /* enable runpm on VI+ */
                        adev->runpm = true;