summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Mickler2009-07-13 12:40:32 +0200
committerEric Anholt2009-07-14 00:24:40 +0200
commit832cc28d5bc676331e6376d940ae45d5937aa688 (patch)
tree8c672a09636e300d90d3a691c68a1f629482f462
parentMerge branch 'kmemleak' of git://linux-arm.org/linux-2.6 (diff)
downloadkernel-qcow2-linux-832cc28d5bc676331e6376d940ae45d5937aa688.tar.gz
kernel-qcow2-linux-832cc28d5bc676331e6376d940ae45d5937aa688.tar.xz
kernel-qcow2-linux-832cc28d5bc676331e6376d940ae45d5937aa688.zip
drm/i915: Set lvds dual channel according to register from vbios
Vbios will set lvds register correctly based on current algorithm for lingle/dual Channel LVDS when system boot, so we can accept this configuration directly, regardless of LVDS enable status. It fixed freedesktop.org bug #22262 Signed-off-by: Florian Mickler <florian@mickler.org> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 508838ee31e0..3371cb0ba81b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -645,7 +645,7 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
int err = target;
if (IS_I9XX(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
- (I915_READ(LVDS) & LVDS_PORT_EN) != 0) {
+ (I915_READ(LVDS)) != 0) {
/*
* For LVDS, if the panel is on, just rely on its current
* settings for dual-channel. We haven't figured out how to