diff options
| author | Sonika Jindal <sonika.jindal@intel.com> | 2014-07-21 15:23:40 +0530 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 07:05:43 +0200 |
| commit | 92e23b997332c5aa21a94c3bf81b2546df99089b (patch) | |
| tree | e585b2cdefe96b93a5039ef45e2c64a8ae496fc2 /drivers/gpu/drm/i915 | |
| parent | 9ad0257c3bfdd0ce78a268c73cb886ecf7cdd097 (diff) | |
| download | op-kernel-dev-92e23b997332c5aa21a94c3bf81b2546df99089b.zip op-kernel-dev-92e23b997332c5aa21a94c3bf81b2546df99089b.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |
