projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a05a586
)
drm/i915: simplify pipe checking
author
Eugeni Dodonov
<
[email protected]
>
Sun, 8 Jan 2012 01:40:34 +0000
(23:40 -0200)
committer
Keith Packard
<
[email protected]
>
Mon, 9 Jan 2012 22:17:25 +0000
(14:17 -0800)
This is also handled by i915_reg.h, so just reuse this trick to reduce
universe entropy.
Signed-off-by: Eugeni Dodonov <
[email protected]
>
Reviewed-by: Jesse Barnes <
[email protected]
>
Reviewed-by: Cyril Brulebois <
[email protected]
>
Signed-off-by: Keith Packard <
[email protected]
>
drivers/gpu/drm/i915/i915_suspend.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_suspend.c
b/drivers/gpu/drm/i915/i915_suspend.c
index 7886e4fb60e3e23fb283461a690dbe43a928fc6e..c0b945cdcd9acdf7d5bb3ea208711af86ee79754 100644
(file)
--- 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;