drm/i915: Kill last user of intel_context_create_request outside of selftests

Instead of using intel_context_create_request(), use intel_context_pin()
and i915_create_request directly.

Now all those calls are gone outside of selftests. :)

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200819140904.1708856-17-maarten.lankhorst@linux.intel.com
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index be5a468..a3f72b7 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -2088,6 +2088,7 @@ static int engine_wa_list_verify(struct intel_context *ce,
        const struct i915_wa *wa;
        struct i915_request *rq;
        struct i915_vma *vma;
+       struct i915_gem_ww_ctx ww;
        unsigned int i;
        u32 *results;
        int err;
@@ -2100,29 +2101,34 @@ static int engine_wa_list_verify(struct intel_context *ce,
                return PTR_ERR(vma);
 
        intel_engine_pm_get(ce->engine);
-       rq = intel_context_create_request(ce);
-       intel_engine_pm_put(ce->engine);
+       i915_gem_ww_ctx_init(&ww, false);
+retry:
+       err = i915_gem_object_lock(vma->obj, &ww);
+       if (err == 0)
+               err = intel_context_pin_ww(ce, &ww);
+       if (err)
+               goto err_pm;
+
+       rq = i915_request_create(ce);
        if (IS_ERR(rq)) {
                err = PTR_ERR(rq);
-               goto err_vma;
+               goto err_unpin;
        }
 
-       i915_vma_lock(vma);
        err = i915_request_await_object(rq, vma->obj, true);
        if (err == 0)
                err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);
-       i915_vma_unlock(vma);
-       if (err) {
-               i915_request_add(rq);
-               goto err_vma;
-       }
-
-       err = wa_list_srm(rq, wal, vma);
-       if (err)
-               goto err_vma;
+       if (err == 0)
+               err = wa_list_srm(rq, wal, vma);
 
        i915_request_get(rq);
+       if (err)
+               i915_request_set_error_once(rq, err);
        i915_request_add(rq);
+
+       if (err)
+               goto err_rq;
+
        if (i915_request_wait(rq, 0, HZ / 5) < 0) {
                err = -ETIME;
                goto err_rq;
@@ -2147,7 +2153,16 @@ static int engine_wa_list_verify(struct intel_context *ce,
 
 err_rq:
        i915_request_put(rq);
-err_vma:
+err_unpin:
+       intel_context_unpin(ce);
+err_pm:
+       if (err == -EDEADLK) {
+               err = i915_gem_ww_ctx_backoff(&ww);
+               if (!err)
+                       goto retry;
+       }
+       i915_gem_ww_ctx_fini(&ww);
+       intel_engine_pm_put(ce->engine);
        i915_vma_unpin(vma);
        i915_vma_put(vma);
        return err;