diff options
| author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-01-07 23:40:34 -0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-09 14:17:25 -0800 |
| commit | 5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7 (patch) | |
| tree | d84e789b76090510e58c31d0ef4d5194b0a37075 | |
| parent | a05a586239c66a256ea1fbae859e742e4c91c8d9 (diff) | |
| download | linux-5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7.tar.bz2 | |
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.c | 3 |
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 7886e4fb60e3..c0b945cdcd9a 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -28,6 +28,7 @@ #include "drm.h" #include "i915_drm.h" #include "intel_drv.h" +#include "i915_reg.h" static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe) { @@ -35,7 +36,7 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe) u32 dpll_reg; if (HAS_PCH_SPLIT(dev)) - dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B; + dpll_reg = PCH_DPLL(pipe); else dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B; |