[PATCH] drm/i915: add back checking for i915_disable_power_well

[PATCH] drm/i915: add back checking for i915_disable_power_well

[Imre Deak]

In

commit 6efdf354ddb186c6604d1692075421e8d2c740e9
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Oct 16 17:25:52 2013 +0300

the check for i915_disable_power_well flag was removed by overlook,
so add it back now.

Reported-by: Paulo Zanoni <paulo.zanoni@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a0c907f..09ac9e7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5599,7 +5599,7 @@ static void __intel_power_well_put(struct drm_device *dev,
 				   struct i915_power_well *power_well)
 {
 	WARN_ON(!power_well->count);
-	if (!--power_well->count)
+	if (!--power_well->count && i915_disable_power_well)
 		__intel_set_power_well(dev, false);
 }
 
-- 
1.8.4

Re: [PATCH] drm/i915: add back checking for i915_disable_power_well

[Paulo Zanoni]

2013/10/29 Imre Deak <imre.deak@intel.com>:
> In
>
> commit 6efdf354ddb186c6604d1692075421e8d2c740e9
> Author: Imre Deak <imre.deak@intel.com>
> Date:   Wed Oct 16 17:25:52 2013 +0300
>
> the check for i915_disable_power_well flag was removed by overlook,
> so add it back now.
>
> Reported-by: Paulo Zanoni <paulo.zanoni@intel.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a0c907f..09ac9e7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5599,7 +5599,7 @@ static void __intel_power_well_put(struct drm_device *dev,
>                                    struct i915_power_well *power_well)
>  {
>         WARN_ON(!power_well->count);
> -       if (!--power_well->count)
> +       if (!--power_well->count && i915_disable_power_well)
>                 __intel_set_power_well(dev, false);
>  }
>
> --
> 1.8.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni

Re: [PATCH] drm/i915: add back checking for i915_disable_power_well

[Daniel Vetter]

On Thu, Oct 31, 2013 at 01:37:26PM -0200, Paulo Zanoni wrote:
> 2013/10/29 Imre Deak <imre.deak@intel.com>:
> > In
> >
> > commit 6efdf354ddb186c6604d1692075421e8d2c740e9
> > Author: Imre Deak <imre.deak@intel.com>
> > Date:   Wed Oct 16 17:25:52 2013 +0300
> >
> > the check for i915_disable_power_well flag was removed by overlook,
> > so add it back now.
> >
> > Reported-by: Paulo Zanoni <paulo.zanoni@intel.com>
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> 
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch