summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-06-27 16:30:02 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-07-01 11:27:56 +0200
commit5476f8505b4c4178dbb9f4e9d2bf17e52d8026ed (patch)
tree86aae8e76d663d4dfdae09b353a83154a5e12916 /drivers/gpu/drm/i915/i915_irq.c
parent165e901caa4c9d768dd572aab6b95f89a2e9e204 (diff)
drm/i915: Remove extra error state NULL
Not only was there an extra, but since we now kzalloc the error state, we don't need either. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 92e78167ca8..6a1ae614268 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1931,10 +1931,6 @@ static void i915_capture_error_state(struct drm_device *dev)
i915_gem_record_fences(dev, error);
i915_gem_record_rings(dev, error);
- /* Record buffers on the active and pinned lists. */
- error->active_bo = NULL;
- error->pinned_bo = NULL;
-
i = 0;
list_for_each_entry(obj, &dev_priv->mm.active_list, mm_list)
i++;
@@ -1944,8 +1940,6 @@ static void i915_capture_error_state(struct drm_device *dev)
i++;
error->pinned_bo_count = i - error->active_bo_count;
- error->active_bo = NULL;
- error->pinned_bo = NULL;
if (i) {
error->active_bo = kmalloc(sizeof(*error->active_bo)*i,
GFP_ATOMIC);