From: Daniel Vetter <daniel@ffwll.ch>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 13/13] drm/atomic: Use KMS VBLANK API
Date: Wed, 12 Aug 2015 17:42:01 +0200 [thread overview]
Message-ID: <20150812154201.GP17734@phenom.ffwll.local> (raw)
In-Reply-To: <1439391635-29166-13-git-send-email-thierry.reding@gmail.com>
On Wed, Aug 12, 2015 at 05:00:35PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Instead of using the legacy VBLANK API, use the new KMS API. This is
> part of an effort to convert all existing users so that the KMS API can
> be changed to properly use per-CRTC data.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 1ece3356a71d..f9a705fe97b2 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -966,7 +966,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
> continue;
>
> old_crtc_state->enable = true;
> - old_crtc_state->last_vblank_count = drm_vblank_count(dev, i);
> + old_crtc_state->last_vblank_count = drm_crtc_vblank_count(crtc);
> }
>
> for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> @@ -975,7 +975,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
>
> ret = wait_event_timeout(dev->vblank[i].queue,
> old_crtc_state->last_vblank_count !=
> - drm_vblank_count(dev, i),
> + drm_crtc_vblank_count(crtc),
> msecs_to_jiffies(50));
>
> drm_crtc_vblank_put(crtc);
> --
> 2.4.5
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-08-12 15:42 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 15:00 [PATCH 01/13] drm/gma500: Sanity-check pipe index Thierry Reding
2015-08-12 15:00 ` [PATCH 02/13] drm/irq: Remove negative CRTC index special-case Thierry Reding
2015-08-12 15:28 ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 03/13] drm/bochs: Store correct CRTC index in events Thierry Reding
2015-08-12 15:26 ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 04/13] drm/imx: Make pipe number unsigned Thierry Reding
2015-08-12 15:24 ` Daniel Vetter
2015-08-13 9:05 ` Thierry Reding
2015-08-12 15:00 ` [PATCH 05/13] drm/imx: Store correct CRTC index in events Thierry Reding
2015-08-12 15:00 ` [PATCH 06/13] drm/rockchip: " Thierry Reding
2015-08-12 15:00 ` [PATCH 07/13] drm/sti: " Thierry Reding
2015-08-12 15:26 ` Benjamin Gaignard
2015-08-13 9:06 ` Thierry Reding
2015-08-12 15:00 ` [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference Thierry Reding
2015-08-12 15:40 ` Daniel Vetter
2015-08-13 9:20 ` Thierry Reding
2015-08-13 13:05 ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 09/13] drm/irq: Make pipe unsigned and name consistent Thierry Reding
2015-08-12 15:32 ` Daniel Vetter
2015-10-30 18:38 ` Ilia Mirkin
2015-10-30 18:38 ` Ilia Mirkin
2015-08-13 9:38 ` [PATCH] drm/irq: More pipe/crtc consistency cleanups Thierry Reding
2015-08-13 13:02 ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 10/13] drm/irq: Add drm_crtc_vblank_count_and_time() Thierry Reding
2015-08-12 15:35 ` Daniel Vetter
2015-08-13 9:12 ` Thierry Reding
2015-08-13 13:04 ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 11/13] drm/irq: Document return values more consistently Thierry Reding
2015-08-12 15:00 ` [PATCH 12/13] drm/armada: Use drm_crtc_vblank_*() API Thierry Reding
2015-08-14 13:59 ` Russell King - ARM Linux
2015-08-14 14:24 ` Thierry Reding
2015-08-12 15:00 ` [PATCH 13/13] drm/atomic: Use KMS VBLANK API Thierry Reding
2015-08-12 15:41 ` Daniel Vetter
2015-08-12 15:42 ` Daniel Vetter [this message]
2015-08-13 10:51 ` [PATCH 01/13] drm/gma500: Sanity-check pipe index Patrik Jakobsson
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=20150812154201.GP17734@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=thierry.reding@gmail.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 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.