From: Ben Widawsky <benjamin.widawsky@intel.com>
Date: Tue, 18 Dec 2012 18:31:23 +0000 (-0800)
Subject: drm/i915: Bug on unsupported swizzled platforms
X-Git-Tag: next-20130218~64^2~24^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8782e26c0cf3444a0d11400277bb44de710a0142;p=karo-tx-linux.git

drm/i915: Bug on unsupported swizzled platforms

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ad03dea210bd..6685861cd176 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3897,8 +3897,10 @@ void i915_gem_init_swizzling(struct drm_device *dev)
 	I915_WRITE(TILECTL, I915_READ(TILECTL) | TILECTL_SWZCTL);
 	if (IS_GEN6(dev))
 		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB));
-	else
+	else if (IS_GEN7(dev))
 		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB));
+	else
+		BUG();
 }
 
 static bool