diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2014-04-15 12:44:35 -0400 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-04-22 16:51:21 +0200 |
| commit | 73acacc7397fe854ed2ab75f1c940fa00faaf15e (patch) | |
| tree | 04248fb6a3b781caa30e242a8e123cd70ef53651 /drivers/gpu | |
| parent | e9a4099a59cc598a44006059dd775c25e422b772 (diff) | |
| download | op-kernel-dev-73acacc7397fe854ed2ab75f1c940fa00faaf15e.zip op-kernel-dev-73acacc7397fe854ed2ab75f1c940fa00faaf15e.tar.gz | |
drm/radeon: don't allow runpm=1 on systems with out ATPX
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index fb3d13f..0cc47f1 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 |
