From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v2 2/2] drm/i915: Also record time difference if vblank evasion fails, v2.
Date: Wed, 2 Sep 2015 13:51:53 +0200 [thread overview]
Message-ID: <20150902115153.GY1367@phenom.ffwll.local> (raw)
In-Reply-To: <55E57AC5.6000102@linux.intel.com>
On Tue, Sep 01, 2015 at 12:15:33PM +0200, Maarten Lankhorst wrote:
> This makes the error message slightly more useful.
>
> Changes since v1:
> - Use ktime_get() while irqs are still disabled. (vsyrjala)
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Both applied to dinq, thanks.
-Daniel
> ---
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 63f0d5850cdf..b0c3a3af7ed2 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -563,6 +563,8 @@ struct intel_crtc {
> int scanline_offset;
>
> unsigned start_vbl_count;
> + ktime_t start_vbl_time;
> +
> struct intel_crtc_atomic_commit atomic;
>
> /* scalers available on this crtc */
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 63fba42be2cf..9387af5ef1b8 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -134,6 +134,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
>
> drm_crtc_vblank_put(&crtc->base);
>
> + crtc->start_vbl_time = ktime_get();
> crtc->start_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
>
> trace_i915_pipe_update_vblank_evaded(crtc, min, max,
> @@ -154,14 +155,16 @@ void intel_pipe_update_end(struct intel_crtc *crtc)
> struct drm_device *dev = crtc->base.dev;
> enum pipe pipe = crtc->pipe;
> u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
> + ktime_t end_vbl_time = ktime_get();
>
> trace_i915_pipe_update_end(crtc, end_vbl_count);
>
> local_irq_enable();
>
> if (crtc->start_vbl_count && crtc->start_vbl_count != end_vbl_count)
> - DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u)\n",
> - pipe_name(pipe), crtc->start_vbl_count, end_vbl_count);
> + DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us\n",
> + pipe_name(pipe), crtc->start_vbl_count, end_vbl_count,
> + ktime_us_delta(end_vbl_time, crtc->start_vbl_time));
> }
>
> static void
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-09-02 11:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-31 11:04 [PATCH 1/2] drm/i915: Remove start frame argument to pipe_update_begin/end Maarten Lankhorst
2015-08-31 11:04 ` [PATCH 2/2] drm/i915: Also record time difference if vblank evasion fails Maarten Lankhorst
2015-08-31 11:49 ` Ville Syrjälä
2015-09-01 10:15 ` [PATCH v2 2/2] drm/i915: Also record time difference if vblank evasion fails, v2 Maarten Lankhorst
2015-09-02 11:51 ` Daniel Vetter [this message]
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=20150902115153.GY1367@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@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