Re: [Intel-gfx] [PATCH] drm/i915: Tidy error handling in i915_gem_init_hw

2018-07-12 Thread Chris Wilson 
Quoting Michał Winiarski (2018-07-12 13:48:10)
> Let's reorder things so that we can do onion teardown rather than double
> goto.
> 
> References: b96f6ebfd024 ("drm/i915: Correctly handle error path in 
> i915_gem_init_hw")
> Signed-off-by: Michał Winiarski 
> Cc: Michal Wajdeczko 
> Cc: Sagar Arun Kamble 

Thanks for the patch, pushed.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Tidy error handling in i915_gem_init_hw

2018-07-12 Thread Chris Wilson 
Quoting Michał Winiarski (2018-07-12 13:48:10)
> Let's reorder things so that we can do onion teardown rather than double
> goto.
> 
> References: b96f6ebfd024 ("drm/i915: Correctly handle error path in 
> i915_gem_init_hw")
> Signed-off-by: Michał Winiarski 
> Cc: Michal Wajdeczko 
> Cc: Sagar Arun Kamble 

Ok. My pasta punning pedantry pales away,
Reviewed-by: Chris Wilson 
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915: Tidy error handling in i915_gem_init_hw

2018-07-12 Thread Michał Winiarski 
Let's reorder things so that we can do onion teardown rather than double
goto.

References: b96f6ebfd024 ("drm/i915: Correctly handle error path in 
i915_gem_init_hw")
Signed-off-by: Michał Winiarski 
Cc: Michal Wajdeczko 
Cc: Sagar Arun Kamble 
---
 drivers/gpu/drm/i915/i915_gem.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 07a92ca61dbf..ed2be33ec58a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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)
-- 
2.17.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx