drm/i915: 830M doesn't have an LVDS port
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 10 Jan 2014 12:06:46 +0000 (14:06 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 10 Jan 2014 17:03:27 +0000 (18:03 +0100)
There's no LVDS port on 830M so don't go reading the LVDS control
register.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index db1e0a4eb35974f0fd57e08ac1084e436884fdeb..9db009c55c88c00d8213bcfb699cd78621a27c61 100644 (file)
@@ -7974,7 +7974,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
                else
                        i9xx_clock(refclk, &clock);
        } else {
-               u32 lvds = I915_READ(LVDS);
+               u32 lvds = IS_I830(dev) ? 0 : I915_READ(LVDS);
                bool is_lvds = (pipe == 1) && (lvds & LVDS_PORT_EN);
 
                if (is_lvds) {