diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-03-26 18:07:15 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-27 09:37:39 +1000 |
| commit | e32ee7fa54e3172e6413cefaaee9222a3f521617 (patch) | |
| tree | 9bc7ec6a5d6d2dadd3a38265f4b1ed01a57886af | |
| parent | c6f8505e4627ba8ca46cbcb602ad82e7f17a7122 (diff) | |
| download | op-kernel-dev-e32ee7fa54e3172e6413cefaaee9222a3f521617.zip op-kernel-dev-e32ee7fa54e3172e6413cefaaee9222a3f521617.tar.gz | |
drm: make sure vblank interrupts are disabled at DPMS time
When we call drm_vblank_off() at DPMS off time (to wake any clients so
they don't hang) we need to make sure interrupts are actually disabled.
If drm_vblank_off() gets called before the vblank usage timer expires,
it'll prevent the timer from disabling interrupts since it also clears
the vblank_enabled flag for the pipe.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index b98384d..99ce7dc 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -475,6 +475,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc) unsigned long irqflags; spin_lock_irqsave(&dev->vbl_lock, irqflags); + dev->driver->disable_vblank(dev, crtc); DRM_WAKEUP(&dev->vbl_queue[crtc]); dev->vblank_enabled[crtc] = 0; dev->last_vblank[crtc] = dev->driver->get_vblank_counter(dev, crtc); |
