From: Alex Deucher Date: Tue, 15 Apr 2014 16:44:35 +0000 (-0400) Subject: drm/radeon: don't allow runpm=1 on systems with out ATPX X-Git-Tag: submit/tizen_common/20140730.172411~757 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58ae7e523bd6bfb185518ad4171225ef8c1cb930;p=profile%2Fivi%2Fkernel-x86-ivi.git drm/radeon: don't allow runpm=1 on systems with out ATPX commit 73acacc7397fe854ed2ab75f1c940fa00faaf15e upstream. 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 6e244d2..ea34a31 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -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