aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2014-03-03 17:27:57 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-19 05:14:11 -0400
commit11ea8b7d3e9b5d62217fbd12d66866172e187f9b (patch)
tree1df8ce9c44614b9b6127bdb6e58e793b9ae15a77 /drivers/gpu/drm/i915
parenta2319c08bfd849ea32b4f890ce92df86074c5731 (diff)
drm/i915/vlv: no MCHBAR on VLV
So don't try to allocate and program it, we're only fooling ourselves. Reported-by: "Chang, Junxiao" <junxiao.chang@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Junxiao Chang <junxiao.chang@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_dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 9faee49f210d..7b674bfcb338 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1187,6 +1187,9 @@ intel_setup_mchbar(struct drm_device *dev)
1187 u32 temp; 1187 u32 temp;
1188 bool enabled; 1188 bool enabled;
1189 1189
1190 if (IS_VALLEYVIEW(dev))
1191 return;
1192
1190 dev_priv->mchbar_need_disable = false; 1193 dev_priv->mchbar_need_disable = false;
1191 1194
1192 if (IS_I915G(dev) || IS_I915GM(dev)) { 1195 if (IS_I915G(dev) || IS_I915GM(dev)) {