aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2012-12-18 13:31:22 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-18 16:29:55 -0500
commit7dbf9d6e0fd8d42398955de119ccba6c35813c88 (patch)
tree36ce448fdf929638892f96726b5a0cab8be14baf
parent4d7bb01162b768ca0f7e50aa3f31790d8d08402c (diff)
drm/i915: BUG() if fences are used on unsupported platform
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
2 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 d15c86279d02..ad03dea210bd 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2649,7 +2649,7 @@ static void i915_gem_write_fence(struct drm_device *dev, int reg,
2649 case 4: i965_write_fence_reg(dev, reg, obj); break; 2649 case 4: i965_write_fence_reg(dev, reg, obj); break;
2650 case 3: i915_write_fence_reg(dev, reg, obj); break; 2650 case 3: i915_write_fence_reg(dev, reg, obj); break;
2651 case 2: i830_write_fence_reg(dev, reg, obj); break; 2651 case 2: i830_write_fence_reg(dev, reg, obj); break;
2652 default: break; 2652 default: BUG();
2653 } 2653 }
2654} 2654}
2655 2655
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 551f370657b7..6ba0573e7f16 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1106,6 +1106,8 @@ static void i915_gem_record_fences(struct drm_device *dev,
1106 error->fence[i] = I915_READ(FENCE_REG_830_0 + (i * 4)); 1106 error->fence[i] = I915_READ(FENCE_REG_830_0 + (i * 4));
1107 break; 1107 break;
1108 1108
1109 default:
1110 BUG();
1109 } 1111 }
1110} 1112}
1111 1113