diff options
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index cb3794a00f98..4d3760c63964 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -407,13 +407,16 @@ int drm_irq_uninstall(struct drm_device *dev) | |||
| 407 | /* | 407 | /* |
| 408 | * Wake up any waiters so they don't hang. | 408 | * Wake up any waiters so they don't hang. |
| 409 | */ | 409 | */ |
| 410 | spin_lock_irqsave(&dev->vbl_lock, irqflags); | 410 | if (dev->num_crtcs) { |
| 411 | for (i = 0; i < dev->num_crtcs; i++) { | 411 | spin_lock_irqsave(&dev->vbl_lock, irqflags); |
| 412 | DRM_WAKEUP(&dev->vbl_queue[i]); | 412 | for (i = 0; i < dev->num_crtcs; i++) { |
| 413 | dev->vblank_enabled[i] = 0; | 413 | DRM_WAKEUP(&dev->vbl_queue[i]); |
| 414 | dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i); | 414 | dev->vblank_enabled[i] = 0; |
| 415 | dev->last_vblank[i] = | ||
| 416 | dev->driver->get_vblank_counter(dev, i); | ||
| 417 | } | ||
| 418 | spin_unlock_irqrestore(&dev->vbl_lock, irqflags); | ||
| 415 | } | 419 | } |
| 416 | spin_unlock_irqrestore(&dev->vbl_lock, irqflags); | ||
| 417 | 420 | ||
| 418 | if (!irq_enabled) | 421 | if (!irq_enabled) |
| 419 | return -EINVAL; | 422 | return -EINVAL; |
