drm/i915: Remove extra error state NULL
authorBen Widawsky <ben@bwidawsk.net>
Thu, 27 Jun 2013 23:30:02 +0000 (16:30 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 1 Jul 2013 09:27:56 +0000 (11:27 +0200)
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>
drivers/gpu/drm/i915/i915_irq.c

index 92e78167ca84a237c3e22b714e6527bd11ebe903..6a1ae614268e91d11037b795f9527c9aa5ac80ea 100644 (file)
@@ -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);