diff options
| author | Thierry Reding | 2015-08-12 17:00:35 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-08-12 17:41:30 +0200 |
| commit | d4853630b334017cab9a4602f5e9677e3b792c8a (patch) | |
| tree | 0c8f3a71cf320e581796beae2802c58e5e168c99 /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | drm/irq: Document return values more consistently (diff) | |
| download | kernel-qcow2-linux-d4853630b334017cab9a4602f5e9677e3b792c8a.tar.gz kernel-qcow2-linux-d4853630b334017cab9a4602f5e9677e3b792c8a.tar.xz kernel-qcow2-linux-d4853630b334017cab9a4602f5e9677e3b792c8a.zip | |
drm/atomic: Use KMS VBLANK API
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 96e08e940ed0..52dbeedcdcc8 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -958,7 +958,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) { @@ -967,7 +967,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); |