aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_irq.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 05:34:43 -0500
committerDave Airlie <airlied@redhat.com>2013-12-17 20:34:13 -0500
commit57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd (patch)
tree935ea0949b91080532de66d1d74f8a97a4c81223 /drivers/gpu/drm/drm_irq.c
parente9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (diff)
drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE
Less yelling ftw! Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
-rw-r--r--drivers/gpu/drm/drm_irq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index b52ff052b785..e7de2da57234 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -368,7 +368,7 @@ int drm_irq_uninstall(struct drm_device *dev)
368 if (dev->num_crtcs) { 368 if (dev->num_crtcs) {
369 spin_lock_irqsave(&dev->vbl_lock, irqflags); 369 spin_lock_irqsave(&dev->vbl_lock, irqflags);
370 for (i = 0; i < dev->num_crtcs; i++) { 370 for (i = 0; i < dev->num_crtcs; i++) {
371 DRM_WAKEUP(&dev->vblank[i].queue); 371 wake_up(&dev->vblank[i].queue);
372 dev->vblank[i].enabled = false; 372 dev->vblank[i].enabled = false;
373 dev->vblank[i].last = 373 dev->vblank[i].last =
374 dev->driver->get_vblank_counter(dev, i); 374 dev->driver->get_vblank_counter(dev, i);
@@ -980,7 +980,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
980 980
981 spin_lock_irqsave(&dev->vbl_lock, irqflags); 981 spin_lock_irqsave(&dev->vbl_lock, irqflags);
982 vblank_disable_and_save(dev, crtc); 982 vblank_disable_and_save(dev, crtc);
983 DRM_WAKEUP(&dev->vblank[crtc].queue); 983 wake_up(&dev->vblank[crtc].queue);
984 984
985 /* Send any queued vblank events, lest the natives grow disquiet */ 985 /* Send any queued vblank events, lest the natives grow disquiet */
986 seq = drm_vblank_count_and_time(dev, crtc, &now); 986 seq = drm_vblank_count_and_time(dev, crtc, &now);
@@ -1363,7 +1363,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
1363 crtc, (int) diff_ns); 1363 crtc, (int) diff_ns);
1364 } 1364 }
1365 1365
1366 DRM_WAKEUP(&dev->vblank[crtc].queue); 1366 wake_up(&dev->vblank[crtc].queue);
1367 drm_handle_vblank_events(dev, crtc); 1367 drm_handle_vblank_events(dev, crtc);
1368 1368
1369 spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); 1369 spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);