From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Only wait one vblank when disabling crc if the pipe is on
Date: Fri, 6 Jun 2014 11:57:10 +0300 [thread overview]
Message-ID: <20140606085710.GG27580@intel.com> (raw)
In-Reply-To: <1402035728-10127-1-git-send-email-daniel.vetter@ffwll.ch>
On Fri, Jun 06, 2014 at 08:22:08AM +0200, Daniel Vetter wrote:
> Otherwise we incur an unsightly WARNING. The mutex locking is a bit
> overkill, but it curbs races and eventially we might grow a locking
> check in the vblank wait code to make sure the right crtc lock is
> held.
>
> This is fallout from
>
> commit 9393707190194eb8b42e412b444a03331db6862f
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> AuthorDate: Fri Apr 4 16:12:09 2014 -0700
>
> drm/i915: warn when a vblank wait times out
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79612
> Tested-by: Guo Jinxian <jinxianx.guo@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 601caa88c092..cf94e9640627 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2927,11 +2927,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
> /* real source -> none transition */
> if (source == INTEL_PIPE_CRC_SOURCE_NONE) {
> struct intel_pipe_crc_entry *entries;
> + struct intel_crtc *crtc =
> + crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
^^^^^^
What's that?
Otherwise:
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> DRM_DEBUG_DRIVER("stopping CRCs for pipe %c\n",
> pipe_name(pipe));
>
> - intel_wait_for_vblank(dev, pipe);
> + mutex_lock(&crtc->base.mutex);
> + if (crtc->active)
> + intel_wait_for_vblank(dev, pipe);
> + mutex_unlock(&crtc->base.mutex);
>
> spin_lock_irq(&pipe_crc->lock);
> entries = pipe_crc->entries;
> --
> 2.0.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2014-06-06 8:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 6:22 [PATCH] drm/i915: Only wait one vblank when disabling crc if the pipe is on Daniel Vetter
2014-06-06 8:57 ` Ville Syrjälä [this message]
2014-06-06 9:36 ` Daniel Vetter
2014-06-06 17:18 ` Damien Lespiau
2014-06-06 17:40 ` Daniel Vetter
2014-06-13 12:08 ` Jani Nikula
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=20140606085710.GG27580@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.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