summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorJesse Barnes2014-03-03 23:27:57 +0100
committerDaniel Vetter2014-03-19 10:14:11 +0100
commit11ea8b7d3e9b5d62217fbd12d66866172e187f9b (patch)
tree1df8ce9c44614b9b6127bdb6e58e793b9ae15a77 /drivers/gpu/drm/i915/i915_dma.c
parentdrm/i915/bdw: Restore PPAT on thaw (diff)
downloadkernel-qcow2-linux-11ea8b7d3e9b5d62217fbd12d66866172e187f9b.tar.gz
kernel-qcow2-linux-11ea8b7d3e9b5d62217fbd12d66866172e187f9b.tar.xz
kernel-qcow2-linux-11ea8b7d3e9b5d62217fbd12d66866172e187f9b.zip
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/i915_dma.c')
-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)
u32 temp;
bool enabled;
+ if (IS_VALLEYVIEW(dev))
+ return;
+
dev_priv->mchbar_need_disable = false;
if (IS_I915G(dev) || IS_I915GM(dev)) {