diff options
author | Sonika Jindal <sonika.jindal@intel.com> | 2014-07-21 05:53:40 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 01:05:43 -0400 |
commit | 92e23b997332c5aa21a94c3bf81b2546df99089b (patch) | |
tree | e585b2cdefe96b93a5039ef45e2c64a8ae496fc2 | |
parent | 9ad0257c3bfdd0ce78a268c73cb886ecf7cdd097 (diff) |
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>
-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 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); | |||
2803 | 2803 | ||
2804 | static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev) | 2804 | static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev) |
2805 | { | 2805 | { |
2806 | if (HAS_PCH_SPLIT(dev)) | 2806 | if (IS_VALLEYVIEW(dev)) |
2807 | return CPU_VGACNTRL; | ||
2808 | else if (IS_VALLEYVIEW(dev)) | ||
2809 | return VLV_VGACNTRL; | 2807 | return VLV_VGACNTRL; |
2808 | else if (INTEL_INFO(dev)->gen >= 5) | ||
2809 | return CPU_VGACNTRL; | ||
2810 | else | 2810 | else |
2811 | return VGACNTRL; | 2811 | return VGACNTRL; |
2812 | } | 2812 | } |