From: Ville Syrjälä Date: Thu, 6 Mar 2014 15:27:39 +0000 (+0200) Subject: drm: Make blocking vblank wait return when the vblank interrupts get disabled X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3212a22ff7b1adad9c8bda6655dd483a6a91bdba;p=linux-beck.git drm: Make blocking vblank wait return when the vblank interrupts get disabled If there's a blocking vblank wait in progress while the vblank interrupt gets disabled, the current code will just let the vblank wait time out. Instead make it return immediately when vblank interrupts get disabled. Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 90c59a8c820f..13d671ed3421 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1189,6 +1189,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * HZ, (((drm_vblank_count(dev, crtc) - vblwait->request.sequence) <= (1 << 23)) || + !dev->vblank[crtc].enabled || !dev->irq_enabled)); if (ret != -EINTR) {