summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-10-23 12:01:00 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-10-23 12:01:00 +0200
commitbfd7bbdd03a213ade7d997d91c8df25cfecf0cc5 (patch)
tree1aefecd71ba1a15e3fef7ef3ab569f2f586d65d7
parentaed8bbd4bd054f29e6c8cd7c7dd9b870992426ad (diff)
downloadop-kernel-dev-bfd7bbdd03a213ade7d997d91c8df25cfecf0cc5.zip
op-kernel-dev-bfd7bbdd03a213ade7d997d91c8df25cfecf0cc5.tar.gz
Revert "drm/i915: Add soft-pinning API for execbuffer"
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>
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index f3dc67b..2f04e4f 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -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;
OpenPOWER on IntegriCloud