diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:43 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:34:13 -0500 |
commit | 57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd (patch) | |
tree | 935ea0949b91080532de66d1d74f8a97a4c81223 /drivers/gpu/drm/mga/mga_irq.c | |
parent | e9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (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/mga/mga_irq.c')
-rw-r--r-- | drivers/gpu/drm/mga/mga_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c index 14c0e3ca2b07..1b071b8ff9dc 100644 --- a/drivers/gpu/drm/mga/mga_irq.c +++ b/drivers/gpu/drm/mga/mga_irq.c | |||
@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg) | |||
79 | MGA_WRITE(MGA_PRIMEND, prim_end); | 79 | MGA_WRITE(MGA_PRIMEND, prim_end); |
80 | 80 | ||
81 | atomic_inc(&dev_priv->last_fence_retired); | 81 | atomic_inc(&dev_priv->last_fence_retired); |
82 | DRM_WAKEUP(&dev_priv->fence_queue); | 82 | wake_up(&dev_priv->fence_queue); |
83 | handled = 1; | 83 | handled = 1; |
84 | } | 84 | } |
85 | 85 | ||
@@ -151,7 +151,7 @@ int mga_driver_irq_postinstall(struct drm_device *dev) | |||
151 | { | 151 | { |
152 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; | 152 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; |
153 | 153 | ||
154 | DRM_INIT_WAITQUEUE(&dev_priv->fence_queue); | 154 | init_waitqueue_head(&dev_priv->fence_queue); |
155 | 155 | ||
156 | /* Turn on soft trap interrupt. Vertical blank interrupts are enabled | 156 | /* Turn on soft trap interrupt. Vertical blank interrupts are enabled |
157 | * in mga_enable_vblank. | 157 | * in mga_enable_vblank. |