drm/i915: Fix uninitialised variable in intel_context_create_request.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 18 Sep 2020 11:12:08 +0000 (13:12 +0200)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 30 Sep 2020 18:24:32 +0000 (14:24 -0400)
In case backoff fails with an error, we return an undefined rq,
assign err to rq correctly.

Fixes: 8a929c9eb1c2 ("drm/i915: Use ww pinning for intel_context_create_request()")
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200918111208.1392128-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 4316b19dee27cc5cd34a95fdbc0a3a5237507701)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_context.c

index d301dda..92a3f25 100644 (file)
@@ -472,6 +472,7 @@ retry:
                err = i915_gem_ww_ctx_backoff(&ww);
                if (!err)
                        goto retry;
+               rq = ERR_PTR(err);
        } else {
                rq = ERR_PTR(err);
        }