From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 10 Jan 2014 12:06:46 +0000 (+0200)
Subject: drm/i915: 830M doesn't have an LVDS port
X-Git-Tag: MMI-PSA29.97-13-9~12830^2~16^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0fb58223967fdf5acc2bdbfe50347841843131bc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/i915: 830M doesn't have an LVDS port

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>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index db1e0a4eb359..9db009c55c88 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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) {