Browse Source

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>
Sonika Jindal 11 years ago
parent
commit
92e23b9973
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/gpu/drm/i915/i915_drv.h

+ 3 - 3
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)
 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;
 		return VLV_VGACNTRL;
+	else if (INTEL_INFO(dev)->gen >= 5)
+		return CPU_VGACNTRL;
 	else
 	else
 		return VGACNTRL;
 		return VGACNTRL;
 }
 }