All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/2] drm/i915/pm: Unstatic power_domain_str
@ 2015-11-20 15:55 Daniel Stone
  2015-11-20 15:55 ` [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure Daniel Stone
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Stone @ 2015-11-20 15:55 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula, ville.syrjala

Let us print human-parseable values from the power domain code; upcoming
display code also wants to use it.

This requires moving it out of i915_debugfs.c, as that is only conditionally
compiled.

v2: Move it out of the header.

Signed-off-by: Daniel Stone <daniels@collabora.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 67 +--------------------------------
 drivers/gpu/drm/i915/intel_drv.h        |  2 +
 drivers/gpu/drm/i915/intel_runtime_pm.c | 66 ++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 411a9c6..b28da6f 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2685,71 +2685,6 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
 	return 0;
 }
 
-static const char *power_domain_str(enum intel_display_power_domain domain)
-{
-	switch (domain) {
-	case POWER_DOMAIN_PIPE_A:
-		return "PIPE_A";
-	case POWER_DOMAIN_PIPE_B:
-		return "PIPE_B";
-	case POWER_DOMAIN_PIPE_C:
-		return "PIPE_C";
-	case POWER_DOMAIN_PIPE_A_PANEL_FITTER:
-		return "PIPE_A_PANEL_FITTER";
-	case POWER_DOMAIN_PIPE_B_PANEL_FITTER:
-		return "PIPE_B_PANEL_FITTER";
-	case POWER_DOMAIN_PIPE_C_PANEL_FITTER:
-		return "PIPE_C_PANEL_FITTER";
-	case POWER_DOMAIN_TRANSCODER_A:
-		return "TRANSCODER_A";
-	case POWER_DOMAIN_TRANSCODER_B:
-		return "TRANSCODER_B";
-	case POWER_DOMAIN_TRANSCODER_C:
-		return "TRANSCODER_C";
-	case POWER_DOMAIN_TRANSCODER_EDP:
-		return "TRANSCODER_EDP";
-	case POWER_DOMAIN_PORT_DDI_A_LANES:
-		return "PORT_DDI_A_LANES";
-	case POWER_DOMAIN_PORT_DDI_B_LANES:
-		return "PORT_DDI_B_LANES";
-	case POWER_DOMAIN_PORT_DDI_C_LANES:
-		return "PORT_DDI_C_LANES";
-	case POWER_DOMAIN_PORT_DDI_D_LANES:
-		return "PORT_DDI_D_LANES";
-	case POWER_DOMAIN_PORT_DDI_E_LANES:
-		return "PORT_DDI_E_LANES";
-	case POWER_DOMAIN_PORT_DSI:
-		return "PORT_DSI";
-	case POWER_DOMAIN_PORT_CRT:
-		return "PORT_CRT";
-	case POWER_DOMAIN_PORT_OTHER:
-		return "PORT_OTHER";
-	case POWER_DOMAIN_VGA:
-		return "VGA";
-	case POWER_DOMAIN_AUDIO:
-		return "AUDIO";
-	case POWER_DOMAIN_PLLS:
-		return "PLLS";
-	case POWER_DOMAIN_AUX_A:
-		return "AUX_A";
-	case POWER_DOMAIN_AUX_B:
-		return "AUX_B";
-	case POWER_DOMAIN_AUX_C:
-		return "AUX_C";
-	case POWER_DOMAIN_AUX_D:
-		return "AUX_D";
-	case POWER_DOMAIN_GMBUS:
-		return "GMBUS";
-	case POWER_DOMAIN_MODESET:
-		return "MODESET";
-	case POWER_DOMAIN_INIT:
-		return "INIT";
-	default:
-		MISSING_CASE(domain);
-		return "?";
-	}
-}
-
 static int i915_power_domain_info(struct seq_file *m, void *unused)
 {
 	struct drm_info_node *node = m->private;
@@ -2775,7 +2710,7 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)
 				continue;
 
 			seq_printf(m, "  %-23s %d\n",
-				 power_domain_str(power_domain),
+				 intel_display_power_domain_str(power_domain),
 				 power_domains->domain_use_count[power_domain]);
 		}
 	}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index ab5c147..8fae824 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1410,6 +1410,8 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv);
 void skl_pw1_misc_io_init(struct drm_i915_private *dev_priv);
 void skl_pw1_misc_io_fini(struct drm_i915_private *dev_priv);
 void intel_runtime_pm_enable(struct drm_i915_private *dev_priv);
+const char *
+intel_display_power_domain_str(enum intel_display_power_domain domain);
 
 bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
 				    enum intel_display_power_domain domain);
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index a1dc815..754f9bd 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -65,6 +65,72 @@
 bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,
 				    int power_well_id);
 
+const char *
+intel_display_power_domain_str(enum intel_display_power_domain domain)
+{
+	switch (domain) {
+	case POWER_DOMAIN_PIPE_A:
+		return "PIPE_A";
+	case POWER_DOMAIN_PIPE_B:
+		return "PIPE_B";
+	case POWER_DOMAIN_PIPE_C:
+		return "PIPE_C";
+	case POWER_DOMAIN_PIPE_A_PANEL_FITTER:
+		return "PIPE_A_PANEL_FITTER";
+	case POWER_DOMAIN_PIPE_B_PANEL_FITTER:
+		return "PIPE_B_PANEL_FITTER";
+	case POWER_DOMAIN_PIPE_C_PANEL_FITTER:
+		return "PIPE_C_PANEL_FITTER";
+	case POWER_DOMAIN_TRANSCODER_A:
+		return "TRANSCODER_A";
+	case POWER_DOMAIN_TRANSCODER_B:
+		return "TRANSCODER_B";
+	case POWER_DOMAIN_TRANSCODER_C:
+		return "TRANSCODER_C";
+	case POWER_DOMAIN_TRANSCODER_EDP:
+		return "TRANSCODER_EDP";
+	case POWER_DOMAIN_PORT_DDI_A_LANES:
+		return "PORT_DDI_A_LANES";
+	case POWER_DOMAIN_PORT_DDI_B_LANES:
+		return "PORT_DDI_B_LANES";
+	case POWER_DOMAIN_PORT_DDI_C_LANES:
+		return "PORT_DDI_C_LANES";
+	case POWER_DOMAIN_PORT_DDI_D_LANES:
+		return "PORT_DDI_D_LANES";
+	case POWER_DOMAIN_PORT_DDI_E_LANES:
+		return "PORT_DDI_E_LANES";
+	case POWER_DOMAIN_PORT_DSI:
+		return "PORT_DSI";
+	case POWER_DOMAIN_PORT_CRT:
+		return "PORT_CRT";
+	case POWER_DOMAIN_PORT_OTHER:
+		return "PORT_OTHER";
+	case POWER_DOMAIN_VGA:
+		return "VGA";
+	case POWER_DOMAIN_AUDIO:
+		return "AUDIO";
+	case POWER_DOMAIN_PLLS:
+		return "PLLS";
+	case POWER_DOMAIN_AUX_A:
+		return "AUX_A";
+	case POWER_DOMAIN_AUX_B:
+		return "AUX_B";
+	case POWER_DOMAIN_AUX_C:
+		return "AUX_C";
+	case POWER_DOMAIN_AUX_D:
+		return "AUX_D";
+	case POWER_DOMAIN_GMBUS:
+		return "GMBUS";
+	case POWER_DOMAIN_INIT:
+		return "INIT";
+	case POWER_DOMAIN_MODESET:
+		return "MODESET";
+	default:
+		MISSING_CASE(domain);
+		return "?";
+	}
+}
+
 static void intel_power_well_enable(struct drm_i915_private *dev_priv,
 				    struct i915_power_well *power_well)
 {
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure
  2015-11-20 15:55 [PATCH v2 1/2] drm/i915/pm: Unstatic power_domain_str Daniel Stone
@ 2015-11-20 15:55 ` Daniel Stone
  2015-11-20 16:03   ` Ville Syrjälä
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Stone @ 2015-11-20 15:55 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula, ville.syrjala

If we experience a refcounting failure in a power domain/well (unref'ing at
least one too many times), log the name of the offending domain or well.

Signed-off-by: Daniel Stone <daniels@collabora.com>
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 754f9bd..7237dea 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -1499,11 +1499,15 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
 
 	mutex_lock(&power_domains->lock);
 
-	WARN_ON(!power_domains->domain_use_count[domain]);
+	WARN(!power_domains->domain_use_count[domain],
+	     "Use count on domain %s is already zero\n",
+	     intel_display_power_domain_str(domain));
 	power_domains->domain_use_count[domain]--;
 
 	for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
-		WARN_ON(!power_well->count);
+		WARN(!power_well->count,
+		     "Use count on power well %s is already zero",
+		     power_well->name);
 
 		if (!--power_well->count)
 			intel_power_well_disable(dev_priv, power_well);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure
  2015-11-20 15:55 ` [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure Daniel Stone
@ 2015-11-20 16:03   ` Ville Syrjälä
  2015-11-23 10:31     ` Jani Nikula
  0 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2015-11-20 16:03 UTC (permalink / raw)
  To: Daniel Stone; +Cc: jani.nikula, intel-gfx, ville.syrjala

On Fri, Nov 20, 2015 at 03:55:34PM +0000, Daniel Stone wrote:
> If we experience a refcounting failure in a power domain/well (unref'ing at
> least one too many times), log the name of the offending domain or well.
> 
> Signed-off-by: Daniel Stone <daniels@collabora.com>

Both patches look OK to me
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 754f9bd..7237dea 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -1499,11 +1499,15 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
>  
>  	mutex_lock(&power_domains->lock);
>  
> -	WARN_ON(!power_domains->domain_use_count[domain]);
> +	WARN(!power_domains->domain_use_count[domain],
> +	     "Use count on domain %s is already zero\n",
> +	     intel_display_power_domain_str(domain));
>  	power_domains->domain_use_count[domain]--;
>  
>  	for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
> -		WARN_ON(!power_well->count);
> +		WARN(!power_well->count,
> +		     "Use count on power well %s is already zero",
> +		     power_well->name);
>  
>  		if (!--power_well->count)
>  			intel_power_well_disable(dev_priv, power_well);
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure
  2015-11-20 16:03   ` Ville Syrjälä
@ 2015-11-23 10:31     ` Jani Nikula
  2015-11-23 15:12       ` Imre Deak
  0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2015-11-23 10:31 UTC (permalink / raw)
  To: Ville Syrjälä, Daniel Stone; +Cc: intel-gfx, ville.syrjala

On Fri, 20 Nov 2015, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Nov 20, 2015 at 03:55:34PM +0000, Daniel Stone wrote:
>> If we experience a refcounting failure in a power domain/well (unref'ing at
>> least one too many times), log the name of the offending domain or well.
>> 
>> Signed-off-by: Daniel Stone <daniels@collabora.com>
>
> Both patches look OK to me
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Acked-by: Jani Nikula <jani.nikula@intel.com>


>
>> ---
>>  drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
>> index 754f9bd..7237dea 100644
>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>> @@ -1499,11 +1499,15 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
>>  
>>  	mutex_lock(&power_domains->lock);
>>  
>> -	WARN_ON(!power_domains->domain_use_count[domain]);
>> +	WARN(!power_domains->domain_use_count[domain],
>> +	     "Use count on domain %s is already zero\n",
>> +	     intel_display_power_domain_str(domain));
>>  	power_domains->domain_use_count[domain]--;
>>  
>>  	for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
>> -		WARN_ON(!power_well->count);
>> +		WARN(!power_well->count,
>> +		     "Use count on power well %s is already zero",
>> +		     power_well->name);
>>  
>>  		if (!--power_well->count)
>>  			intel_power_well_disable(dev_priv, power_well);
>> -- 
>> 2.5.0
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure
  2015-11-23 10:31     ` Jani Nikula
@ 2015-11-23 15:12       ` Imre Deak
  0 siblings, 0 replies; 5+ messages in thread
From: Imre Deak @ 2015-11-23 15:12 UTC (permalink / raw)
  To: Jani Nikula, Ville Syrjälä, Daniel Stone
  Cc: intel-gfx, ville.syrjala

On ma, 2015-11-23 at 12:31 +0200, Jani Nikula wrote:
> On Fri, 20 Nov 2015, Ville Syrjälä <ville.syrjala@linux.intel.com>
> wrote:
> > On Fri, Nov 20, 2015 at 03:55:34PM +0000, Daniel Stone wrote:
> > > If we experience a refcounting failure in a power domain/well
> > > (unref'ing at
> > > least one too many times), log the name of the offending domain
> > > or well.
> > > 
> > > Signed-off-by: Daniel Stone <daniels@collabora.com>
> > 
> > Both patches look OK to me
> > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Acked-by: Jani Nikula <jani.nikula@intel.com>

Push both patches to dinq, thanks for the patch and review.

--Imre

> > > ---
> > >  drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++--
> > >  1 file changed, 6 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
> > > b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > > index 754f9bd..7237dea 100644
> > > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > > @@ -1499,11 +1499,15 @@ void intel_display_power_put(struct
> > > drm_i915_private *dev_priv,
> > >  
> > >  	mutex_lock(&power_domains->lock);
> > >  
> > > -	WARN_ON(!power_domains->domain_use_count[domain]);
> > > +	WARN(!power_domains->domain_use_count[domain],
> > > +	     "Use count on domain %s is already zero\n",
> > > +	     intel_display_power_domain_str(domain));
> > >  	power_domains->domain_use_count[domain]--;
> > >  
> > >  	for_each_power_well_rev(i, power_well, BIT(domain),
> > > power_domains) {
> > > -		WARN_ON(!power_well->count);
> > > +		WARN(!power_well->count,
> > > +		     "Use count on power well %s is already
> > > zero",
> > > +		     power_well->name);
> > >  
> > >  		if (!--power_well->count)
> > >  			intel_power_well_disable(dev_priv,
> > > power_well);
> > > -- 
> > > 2.5.0
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-11-23 15:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-20 15:55 [PATCH v2 1/2] drm/i915/pm: Unstatic power_domain_str Daniel Stone
2015-11-20 15:55 ` [PATCH v2 2/2] drm/i915/pm: Print offending domain in refcount failure Daniel Stone
2015-11-20 16:03   ` Ville Syrjälä
2015-11-23 10:31     ` Jani Nikula
2015-11-23 15:12       ` Imre Deak

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.