openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/guc: Don't leak stage descriptor pool on init failure 

In case of failure during GuC clients creation, we forget to
cleanup earlier pool allocation. Use proper teardown to fix that.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180605120547.16468-1-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2018-06-05 12:05:47 +00:00 committed by Chris Wilson
parent 9f473ecfe7
commit 70be8b3dab
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/intel_guc_submission.c
View File

@ -1157,7 +1157,7 @@ int intel_guc_submission_init(struct intel_guc *guc)
WARN_ON(!guc_verify_doorbells(guc)); WARN_ON(!guc_verify_doorbells(guc));
ret = guc_clients_create(guc); ret = guc_clients_create(guc);
if (ret) if (ret)
return ret; goto err_pool;
for_each_engine(engine, dev_priv, id) { for_each_engine(engine, dev_priv, id) {
guc->preempt_work[id].engine = engine; guc->preempt_work[id].engine = engine;
@ -1166,6 +1166,9 @@ int intel_guc_submission_init(struct intel_guc *guc)
return 0; return 0;
err_pool:
guc_stage_desc_pool_destroy(guc);
return ret;
} }
void intel_guc_submission_fini(struct intel_guc *guc) void intel_guc_submission_fini(struct intel_guc *guc)