Commit 60c0a66e authored Jul 12, 2018 by Michał Winiarski Committed by Chris Wilson Jul 12, 2018

drm/i915: Tidy error handling in i915_gem_init_hw



Let's reorder things so that we can do onion teardown rather than double
goto.

References: b96f6ebf ("drm/i915: Correctly handle error path in i915_gem_init_hw")
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712124810.25241-1-michal.winiarski@intel.com

parent 5bfbeacf

drivers/gpu/drm/i915/i915_gem.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -5313,13 +5313,17 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
		ret = __i915_gem_restart_engines(dev_priv);
		if (ret)
		goto cleanup_uc;
		out:

		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
		return ret;

		return 0;

		cleanup_uc:
		intel_uc_fini_hw(dev_priv);
		goto out;
		out:
		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);

		return ret;
		}

		static int __intel_engines_record_defaults(struct drm_i915_private *i915)