Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b96f6ebf authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Correctly handle error path in i915_gem_init_hw 



In function gem_init_hw() we are calling uc_init_hw() but in case
of error later in function, we missed to call matching uc_fini_hw()

v2: pulled out from the series

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180605122443.23776-1-michal.wajdeczko@intel.com
parent 83d317ad

drivers/gpu/drm/i915/i915_gem.c

+6 −0
Original line number Diff line number Diff line
@@ -5286,9 +5286,15 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) 


	/* Only when the HW is re-initialised, can we replay the requests */

	ret = __i915_gem_restart_engines(dev_priv);

	if (ret)

		goto cleanup_uc;

out:

	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);

	return ret;



cleanup_uc:

	intel_uc_fini_hw(dev_priv);

	goto out;

}



static int __intel_engines_record_defaults(struct drm_i915_private *i915)