diff mbox

[5/5] drm/i915: No need to put forcewake after a reset

Message ID 1392996723-8886-6-git-send-email-mika.kuoppala@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mika Kuoppala Feb. 21, 2014, 3:32 p.m. UTC 
From: Mika Kuoppala <mika.kuoppala@intel.com>

As we now have intel_uncore_forcewake_reset() no need
to do explicit put after reset.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Daniel Vetter March 5, 2014, 2:58 p.m. UTC | #1 
On Fri, Feb 21, 2014 at 05:32:03PM +0200, mika.kuoppala@intel.com wrote:
> From: Mika Kuoppala <mika.kuoppala@intel.com>
> 
> As we now have intel_uncore_forcewake_reset() no need
> to do explicit put after reset.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

I've merged patches 2-4 from this series now too (patch 1 is already
merged). But this one conflicts badly with Ville's patch, can you please
respin?

Thanks, Daniel
Mika Kuoppala March 5, 2014, 4:11 p.m. UTC | #2 
Daniel Vetter <daniel@ffwll.ch> writes:

> On Fri, Feb 21, 2014 at 05:32:03PM +0200, mika.kuoppala@intel.com wrote:
>> From: Mika Kuoppala <mika.kuoppala@intel.com>
>> 
>> As we now have intel_uncore_forcewake_reset() no need
>> to do explicit put after reset.
>> 
>> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>
> I've merged patches 2-4 from this series now too (patch 1 is already
> merged). But this one conflicts badly with Ville's patch, can you please
> respin?

Didn't find 4/5 from dinq so rebased 4 and 5 on top of dinq at:
1394035700-19630-1-git-send-email-mika.kuoppala@intel.com

-Mika

> Thanks, Daniel
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index ae068c1..176b678 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -969,11 +969,9 @@  static int gen6_do_reset(struct drm_device *dev)
 
 	intel_uncore_forcewake_reset(dev);
 
-	/* If reset with a user forcewake, try to restore, otherwise turn it off */
+	/* If reset with a user forcewake, try to restore */
 	if (dev_priv->uncore.forcewake_count)
 		dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
-	else
-		dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
 
 	if (IS_GEN6(dev) || IS_GEN7(dev))
 		WARN_ON((__raw_i915_read32(dev_priv, GTFIFOCTL) &