drm/radeon: don't allow runpm=1 on systems with out ATPX
authorAlex Deucher <alexdeucher@gmail.com>
Tue, 15 Apr 2014 16:44:35 +0000 (12:44 -0400)
committerChristian König <christian.koenig@amd.com>
Tue, 22 Apr 2014 14:51:21 +0000 (16:51 +0200)
vgaswitcheroo and the ATPX ACPI methods are required to
power down the dGPU.

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=73901

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_kms.c

index fb3d13f693ddb18fd32e8a4ef1a486305c615eed..0cc47f12d9957d916b41acf4d3874fa062313175 100644 (file)
@@ -107,11 +107,9 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
                flags |= RADEON_IS_PCI;
        }
 
-       if (radeon_runtime_pm == 1)
-               flags |= RADEON_IS_PX;
-       else if ((radeon_runtime_pm == -1) &&
-                radeon_has_atpx() &&
-                ((flags & RADEON_IS_IGP) == 0))
+       if ((radeon_runtime_pm != 0) &&
+           radeon_has_atpx() &&
+           ((flags & RADEON_IS_IGP) == 0))
                flags |= RADEON_IS_PX;
 
        /* radeon_device_init should report only fatal error