aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-01-07 20:40:34 -0500
committerKeith Packard <keithp@keithp.com>2012-01-09 17:17:25 -0500
commit5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7 (patch)
treed84e789b76090510e58c31d0ef4d5194b0a37075
parenta05a586239c66a256ea1fbae859e742e4c91c8d9 (diff)
drm/i915: simplify pipe checking
This is also handled by i915_reg.h, so just reuse this trick to reduce universe entropy. Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 7886e4fb60e..c0b945cdcd9 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -28,6 +28,7 @@
28#include "drm.h" 28#include "drm.h"
29#include "i915_drm.h" 29#include "i915_drm.h"
30#include "intel_drv.h" 30#include "intel_drv.h"
31#include "i915_reg.h"
31 32
32static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe) 33static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
33{ 34{
@@ -35,7 +36,7 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
35 u32 dpll_reg; 36 u32 dpll_reg;
36 37
37 if (HAS_PCH_SPLIT(dev)) 38 if (HAS_PCH_SPLIT(dev))
38 dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B; 39 dpll_reg = PCH_DPLL(pipe);
39 else 40 else
40 dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B; 41 dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;
41 42