From: Sonika Jindal <sonika.jindal@intel.com>
Date: Mon, 21 Jul 2014 09:53:40 +0000 (+0530)
Subject: drm/i915: Returning the right VGA control reg for platforms
X-Git-Tag: v4.9.8~5935^2~20^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92e23b997332c5aa21a94c3bf81b2546df99089b;p=platform%2Fkernel%2Flinux-rpi3.git

drm/i915: Returning the right VGA control reg for platforms

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9bc6267..30b23bf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2803,10 +2803,10 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val);
 
 static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev)
 {
-	if (HAS_PCH_SPLIT(dev))
-		return CPU_VGACNTRL;
-	else if (IS_VALLEYVIEW(dev))
+	if (IS_VALLEYVIEW(dev))
 		return VLV_VGACNTRL;
+	else if (INTEL_INFO(dev)->gen >= 5)
+		return CPU_VGACNTRL;
 	else
 		return VGACNTRL;
 }