diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-07-18 02:19:46 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-07-18 02:19:46 +0200 |
| commit | fb328d7365a1fc12166c90758ea6f3c2944539e0 (patch) | |
| tree | d2536f458026961958d01a6fb19fbd5b120df297 /drivers/gpu/drm/radeon/si.c | |
| parent | Merge tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danve... (diff) | |
| parent | drm/radeon/dpm: add debugfs support for RS780/RS880 (v3) (diff) | |
| download | linux-fb328d7365a1fc12166c90758ea6f3c2944539e0.tar.xz linux-fb328d7365a1fc12166c90758ea6f3c2944539e0.zip | |
Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux
more DPM fixes for radeon.
* 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/dpm: add debugfs support for RS780/RS880 (v3)
drm/radeon/dpm/atom: fix broken gcc harder
drm/radeon/dpm/atom: restructure logic to work around a compiler bug
drm/radeon/dpm: fix atom vram table parsing
drm/radeon: fix an endian bug in atom table parsing
drm/radeon: add a module parameter to disable aspm
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index d3f05076f385..d325280e2f9f 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -7053,6 +7053,9 @@ static void si_program_aspm(struct radeon_device *rdev) bool disable_l0s = false, disable_l1 = false, disable_plloff_in_l1 = false; bool disable_clkreq = false; + if (radeon_aspm == 0) + return; + if (!(rdev->flags & RADEON_IS_PCIE)) return; |