]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "drm/i915: Add soft-pinning API for execbuffer"
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 23 Oct 2015 10:01:00 +0000 (12:01 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 23 Oct 2015 10:01:00 +0000 (12:01 +0200)
This reverts commit 510567234180d7d65d2db9f7bd8424cabef13d3c.

I somehow managed to combine a patch from Tomas Elf with a totally
unrelated commit message from Chris Wilson. Let's revert this and
reapply properly.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_gpu_error.c

index f3dc67b33d947abbdb1a68a0581c8ebfd8d1bba5..2f04e4f2ff3514ee2549becb47289d3f8afd8e03 100644 (file)
@@ -1071,25 +1071,6 @@ static void i915_gem_record_rings(struct drm_device *dev,
                list_for_each_entry(request, &ring->request_list, list) {
                        struct drm_i915_error_request *erq;
 
-                       if (count >= error->ring[i].num_requests) {
-                               /*
-                                * If the ring request list was changed in
-                                * between the point where the error request
-                                * list was created and dimensioned and this
-                                * point then just exit early to avoid crashes.
-                                *
-                                * We don't need to communicate that the
-                                * request list changed state during error
-                                * state capture and that the error state is
-                                * slightly incorrect as a consequence since we
-                                * are typically only interested in the request
-                                * list state at the point of error state
-                                * capture, not in any changes happening during
-                                * the capture.
-                                */
-                               break;
-                       }
-
                        erq = &error->ring[i].requests[count++];
                        erq->seqno = request->seqno;
                        erq->jiffies = request->emitted_jiffies;