git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_dvo.c
diff --git
a/drivers/gpu/drm/i915/intel_dvo.c
b/drivers/gpu/drm/i915/intel_dvo.c
index
ea37328
..
6eda1b5
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_dvo.c
+++ b/
drivers/gpu/drm/i915/intel_dvo.c
@@
-178,7
+178,7
@@
static void intel_dvo_mode_set(struct drm_encoder *encoder,
int pipe = intel_crtc->pipe;
u32 dvo_val;
u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
int pipe = intel_crtc->pipe;
u32 dvo_val;
u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
- int dpll_reg =
(pipe == 0) ? DPLL_A : DPLL_B
;
+ int dpll_reg =
DPLL(pipe)
;
switch (dvo_reg) {
case DVOA:
switch (dvo_reg) {
case DVOA: