diff options
| author | Matthew Auld | 2018-03-01 12:46:39 +0100 |
|---|---|---|
| committer | Chris Wilson | 2018-05-08 14:16:20 +0200 |
| commit | aaefa06a0ea845a7088585ca42259515769ea496 (patch) | |
| tree | 60cc9e474322afca6d914b2663c6b0acc767b095 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915/selftests: Flush GPU activity before completing live_contexts (diff) | |
| download | kernel-qcow2-linux-aaefa06a0ea845a7088585ca42259515769ea496.tar.gz kernel-qcow2-linux-aaefa06a0ea845a7088585ca42259515769ea496.tar.xz kernel-qcow2-linux-aaefa06a0ea845a7088585ca42259515769ea496.zip | |
drm/i915: don't leak the pin_map on error
Add some onion to populate_lr_context.
v2: prefer err_unpin_ctx
drop the fixes tag, worst case we just spew a warn before everything
is cleaned up and balance is restored
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180301114639.510-1-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 046adf397a71..da08225fc482 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -2574,8 +2574,10 @@ populate_lr_context(struct i915_gem_context *ctx, defaults = i915_gem_object_pin_map(engine->default_state, I915_MAP_WB); - if (IS_ERR(defaults)) - return PTR_ERR(defaults); + if (IS_ERR(defaults)) { + ret = PTR_ERR(defaults); + goto err_unpin_ctx; + } memcpy(vaddr + start, defaults + start, engine->context_size); i915_gem_object_unpin_map(engine->default_state); @@ -2593,9 +2595,9 @@ populate_lr_context(struct i915_gem_context *ctx, _MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT | CTX_CTRL_ENGINE_CTX_SAVE_INHIBIT); +err_unpin_ctx: i915_gem_object_unpin_map(ctx_obj); - - return 0; + return ret; } static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, |