Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/5] drm/i915: Convert uncleared FIFO underrun message to errors
Date: Fri, 16 May 2014 18:55:56 +0200	[thread overview]
Message-ID: <20140516165556.GV8790@phenom.ffwll.local> (raw)
In-Reply-To: <1400258425-32664-4-git-send-email-ville.syrjala@linux.intel.com>

On Fri, May 16, 2014 at 07:40:23PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Some platforms have a shared error interrupt, so if FIFO underrun
> reporting gets disabled for one pipe/transcoder it gets disabled
> for all pipes/transcoders.
> 
> When we disable FIFO underrun reporting we check whether the
> interrupt was enabled or not. If it wasn't we might have missed
> an underrun and we perform one last check right there. Currently
> we print a debug message when an underrun is detect using this
> mechanism. Promote the message to DRM_ERROR() to match the other
> underrun error messages.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index fdce260..862964f 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -344,8 +344,8 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
>  
>  		if (!was_enabled &&
>  		    (I915_READ(GEN7_ERR_INT) & ERR_INT_FIFO_UNDERRUN(pipe))) {
> -			DRM_DEBUG_KMS("uncleared fifo underrun on pipe %c\n",
> -				      pipe_name(pipe));
> +			DRM_ERROR("uncleared fifo underrun on pipe %c\n",
> +				  pipe_name(pipe));
>  		}
>  	}
>  }
> @@ -429,8 +429,8 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,
>  
>  		if (!was_enabled &&
>  		    (tmp & SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder))) {
> -			DRM_DEBUG_KMS("uncleared pch fifo underrun on pch transcoder %c\n",
> -				      transcoder_name(pch_transcoder));
> +			DRM_ERROR("uncleared pch fifo underrun on pch transcoder %c\n",
> +				  transcoder_name(pch_transcoder));
>  		}
>  	}
>  }
> -- 
> 1.8.5.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

  reply	other threads:[~2014-05-16 16:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-16 16:40 [PATCH 0/5] drm/i915: Some FIFO underrun detection improvements ville.syrjala
2014-05-16 16:40 ` [PATCH 1/5] drm/i915: Check for FIFO underuns when disabling reporting on gmch platforms ville.syrjala
2014-05-21 14:12   ` Thomas Wood
2014-05-16 16:40 ` [PATCH 2/5] drm/i915: Check for FIFO underruns at the end of modeset on gmch ville.syrjala
2014-05-21 14:12   ` Thomas Wood
2014-05-16 16:40 ` [PATCH 3/5] drm/i915: Convert uncleared FIFO underrun message to errors ville.syrjala
2014-05-16 16:55   ` Daniel Vetter [this message]
2014-05-16 16:40 ` [PATCH 4/5] drm/i915: Simplify the uncleared FIFO underrun detection ville.syrjala
2014-05-21 14:13   ` Thomas Wood
2014-05-16 16:40 ` [PATCH 5/5] drm/i915: Shuffle fifo underrun disable/enable points for gmch platforms ville.syrjala
2014-05-21 14:15   ` Thomas Wood
2014-05-21 14:52   ` Daniel Vetter
2014-05-21 14:54     ` Daniel Vetter

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=20140516165556.GV8790@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /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