diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-09-18 13:12:08 +0200 |
|---|---|---|
| committer |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-09-30 14:24:32 -0400 |
| commit | 159ace7ffe690bcdc7afbd9bab81e05dac2afeac (patch) | |
| tree | 6400e96b396712ad13303fef7dc6012a718c617d /drivers/gpu/drm/i915/gt/intel_context.c | |
| parent | drm/i915: Break up error capture compression loops with cond_resched() (diff) | |
| download | wireguard-linux-159ace7ffe690bcdc7afbd9bab81e05dac2afeac.tar.xz wireguard-linux-159ace7ffe690bcdc7afbd9bab81e05dac2afeac.zip | |
drm/i915: Fix uninitialised variable in intel_context_create_request.
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>
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index d301dda1b261..92a3f25c4006 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -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); } |