diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_irq.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c index da690d0e0f03..f035d2bceae7 100644 --- a/drivers/gpu/drm/omapdrm/omap_irq.c +++ b/drivers/gpu/drm/omapdrm/omap_irq.c | |||
@@ -187,7 +187,7 @@ void omap_irq_disable_vblank(struct drm_device *dev, int crtc_id) | |||
187 | dispc_runtime_put(); | 187 | dispc_runtime_put(); |
188 | } | 188 | } |
189 | 189 | ||
190 | irqreturn_t omap_irq_handler(DRM_IRQ_ARGS) | 190 | irqreturn_t omap_irq_handler(int irq, void *arg) |
191 | { | 191 | { |
192 | struct drm_device *dev = (struct drm_device *) arg; | 192 | struct drm_device *dev = (struct drm_device *) arg; |
193 | struct omap_drm_private *priv = dev->dev_private; | 193 | struct omap_drm_private *priv = dev->dev_private; |
@@ -322,7 +322,7 @@ int omap_drm_irq_uninstall(struct drm_device *dev) | |||
322 | if (dev->num_crtcs) { | 322 | if (dev->num_crtcs) { |
323 | spin_lock_irqsave(&dev->vbl_lock, irqflags); | 323 | spin_lock_irqsave(&dev->vbl_lock, irqflags); |
324 | for (i = 0; i < dev->num_crtcs; i++) { | 324 | for (i = 0; i < dev->num_crtcs; i++) { |
325 | DRM_WAKEUP(&dev->vblank[i].queue); | 325 | wake_up(&dev->vblank[i].queue); |
326 | dev->vblank[i].enabled = false; | 326 | dev->vblank[i].enabled = false; |
327 | dev->vblank[i].last = | 327 | dev->vblank[i].last = |
328 | dev->driver->get_vblank_counter(dev, i); | 328 | dev->driver->get_vblank_counter(dev, i); |