On Wed, Aug 12, 2015 at 05:00:35PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
