From: Sonika Jindal Date: Mon, 21 Jul 2014 09:53:40 +0000 (+0530) Subject: drm/i915: Returning the right VGA control reg for platforms X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92e23b997332c5aa21a94c3bf81b2546df99089b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/i915: Returning the right VGA control reg for platforms Signed-off-by: Sonika Jindal Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9bc6267ca920..30b23bf7df28 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; }