From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 3 Mar 2014 22:27:57 +0000 (-0800)
Subject: drm/i915/vlv: no MCHBAR on VLV
X-Git-Tag: v3.15-rc1~51^2~18^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11ea8b7d3e9b5d62217fbd12d66866172e187f9b;p=karo-tx-linux.git

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>
---

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)) {