public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Damien Lespiau <damien.lespiau@intel.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: make CSR firmware messages less verbose
Date: Thu, 10 Sep 2015 16:29:34 +0100	[thread overview]
Message-ID: <20150910152934.GK17633@strange.ger.corp.intel.com> (raw)
In-Reply-To: <1441898428-10689-1-git-send-email-jbarnes@virtuousgeek.org>

On Thu, Sep 10, 2015 at 08:20:28AM -0700, Jesse Barnes wrote:
> Use WARN_ONCE in a bunch of places and demote a message that would
> continually spam us.
> 
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

I had something that could very well address the same problem(s):

  http://lists.freedesktop.org/archives/intel-gfx/2015-June/070093.html

and:

  https://bugs.freedesktop.org/show_bug.cgi?id=90461

But, WARN_ONCE() is not awful I guess:

Acked-by: Damien Lespiau <damien.lespiau@intel.com>

-- 
Damien

> ---
>  drivers/gpu/drm/i915/intel_csr.c        | 12 +++++------
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 36 ++++++++++++++++-----------------
>  2 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index ba1ae03..765dfcd 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -454,10 +454,10 @@ void intel_csr_ucode_fini(struct drm_device *dev)
>  
>  void assert_csr_loaded(struct drm_i915_private *dev_priv)
>  {
> -	WARN(intel_csr_load_status_get(dev_priv) != FW_LOADED,
> -	     "CSR is not loaded.\n");
> -	WARN(!I915_READ(CSR_PROGRAM_BASE),
> -				"CSR program storage start is NULL\n");
> -	WARN(!I915_READ(CSR_SSP_BASE), "CSR SSP Base Not fine\n");
> -	WARN(!I915_READ(CSR_HTP_SKL), "CSR HTP Not fine\n");
> +	WARN_ONCE(intel_csr_load_status_get(dev_priv) != FW_LOADED,
> +		  "CSR is not loaded.\n");
> +	WARN_ONCE(!I915_READ(CSR_PROGRAM_BASE),
> +		  "CSR program storage start is NULL\n");
> +	WARN_ONCE(!I915_READ(CSR_SSP_BASE), "CSR SSP Base Not fine\n");
> +	WARN_ONCE(!I915_READ(CSR_HTP_SKL), "CSR HTP Not fine\n");
>  }
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 3f682a1..85c35fd 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -463,14 +463,14 @@ static void assert_can_enable_dc5(struct drm_i915_private *dev_priv)
>  	bool pg2_enabled = intel_display_power_well_is_enabled(dev_priv,
>  					SKL_DISP_PW_2);
>  
> -	WARN(!IS_SKYLAKE(dev), "Platform doesn't support DC5.\n");
> -	WARN(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n");
> -	WARN(pg2_enabled, "PG2 not disabled to enable DC5.\n");
> +	WARN_ONCE(!IS_SKYLAKE(dev), "Platform doesn't support DC5.\n");
> +	WARN_ONCE(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n");
> +	WARN_ONCE(pg2_enabled, "PG2 not disabled to enable DC5.\n");
>  
> -	WARN((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5),
> -				"DC5 already programmed to be enabled.\n");
> -	WARN(dev_priv->pm.suspended,
> -		"DC5 cannot be enabled, if platform is runtime-suspended.\n");
> +	WARN_ONCE((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5),
> +		  "DC5 already programmed to be enabled.\n");
> +	WARN_ONCE(dev_priv->pm.suspended,
> +		  "DC5 cannot be enabled, if platform is runtime-suspended.\n");
>  
>  	assert_csr_loaded(dev_priv);
>  }
> @@ -486,8 +486,8 @@ static void assert_can_disable_dc5(struct drm_i915_private *dev_priv)
>  	if (dev_priv->power_domains.initializing)
>  		return;
>  
> -	WARN(!pg2_enabled, "PG2 not enabled to disable DC5.\n");
> -	WARN(dev_priv->pm.suspended,
> +	WARN_ONCE(!pg2_enabled, "PG2 not enabled to disable DC5.\n");
> +	WARN_ONCE(dev_priv->pm.suspended,
>  		"Disabling of DC5 while platform is runtime-suspended should never happen.\n");
>  }
>  
> @@ -526,12 +526,12 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv)
>  {
>  	struct drm_device *dev = dev_priv->dev;
>  
> -	WARN(!IS_SKYLAKE(dev), "Platform doesn't support DC6.\n");
> -	WARN(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n");
> -	WARN(I915_READ(UTIL_PIN_CTL) & UTIL_PIN_ENABLE,
> -		"Backlight is not disabled.\n");
> -	WARN((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6),
> -		"DC6 already programmed to be enabled.\n");
> +	WARN_ONCE(!IS_SKYLAKE(dev), "Platform doesn't support DC6.\n");
> +	WARN_ONCE(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n");
> +	WARN_ONCE(I915_READ(UTIL_PIN_CTL) & UTIL_PIN_ENABLE,
> +		  "Backlight is not disabled.\n");
> +	WARN_ONCE((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6),
> +		  "DC6 already programmed to be enabled.\n");
>  
>  	assert_csr_loaded(dev_priv);
>  }
> @@ -546,8 +546,8 @@ static void assert_can_disable_dc6(struct drm_i915_private *dev_priv)
>  		return;
>  
>  	assert_csr_loaded(dev_priv);
> -	WARN(!(I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6),
> -		"DC6 already programmed to be disabled.\n");
> +	WARN_ONCE(!(I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6),
> +		  "DC6 already programmed to be disabled.\n");
>  }
>  
>  static void skl_enable_dc6(struct drm_i915_private *dev_priv)
> @@ -670,7 +670,7 @@ static void skl_set_power_well(struct drm_i915_private *dev_priv,
>  				wait_for((state = intel_csr_load_status_get(dev_priv)) !=
>  						FW_UNINITIALIZED, 1000);
>  				if (state != FW_LOADED)
> -					DRM_ERROR("CSR firmware not ready (%d)\n",
> +					DRM_DEBUG("CSR firmware not ready (%d)\n",
>  							state);
>  				else
>  					if (SKL_ENABLE_DC6(dev))
> -- 
> 1.9.1
> 
> _______________________________________________
> 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

  reply	other threads:[~2015-09-10 15:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-10 15:20 [PATCH] drm/i915: make CSR firmware messages less verbose Jesse Barnes
2015-09-10 15:29 ` Damien Lespiau [this message]
2015-09-11  8:29 ` Chris Wilson
2015-09-11 16:49   ` Jesse Barnes
2015-09-12  7:58     ` Chris Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150910152934.GK17633@strange.ger.corp.intel.com \
    --to=damien.lespiau@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jbarnes@virtuousgeek.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox