diff options
| author | Ben Widawsky | 2012-12-18 19:31:23 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-12-18 22:31:23 +0100 |
| commit | 8782e26c0cf3444a0d11400277bb44de710a0142 (patch) | |
| tree | bd16d12e3d061e7039d0633ed507d8199bac6f79 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: BUG() if fences are used on unsupported platform (diff) | |
| download | kernel-qcow2-linux-8782e26c0cf3444a0d11400277bb44de710a0142.tar.gz kernel-qcow2-linux-8782e26c0cf3444a0d11400277bb44de710a0142.tar.xz kernel-qcow2-linux-8782e26c0cf3444a0d11400277bb44de710a0142.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |