From c98cdff94a6a7877923dec1329c2b76d6247d076 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Fri, 7 Apr 2017 16:15:30 -0400 Subject: [PATCH] Revert "drm: Don't allow interruptions when opening debugfs/crc" This reverts commit b8dfa821c27046ede9bf8eb14cc8109d379428e9 Author: Chris Wilson Date: Fri Apr 7 12:17:12 2017 +0100 drm: Don't allow interruptions when opening debugfs/crc It reportedly breaks things, so let's revert now and try again later. Fixes: b8dfa821c270 ("drm: Don't allow interruptions when opening debugfs/crc") Cc: Chris Wilson Cc: Tomeu Vizoso Cc: Daniel Vetter Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Reported-by: Chris Wilson Acked-by: Chris Wilson Acked-by: Daniel Vetter Signed-off-by: Sean Paul --- drivers/gpu/drm/drm_debugfs_crc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugfs_crc.c index aa13e73..1722d8f 100644 --- a/drivers/gpu/drm/drm_debugfs_crc.c +++ b/drivers/gpu/drm/drm_debugfs_crc.c @@ -177,9 +177,13 @@ static int crtc_crc_open(struct inode *inode, struct file *filep) * guess when this particular piece of HW will be ready to start * generating CRCs. */ - wait_event_lock_irq(crc->wq, crtc_crc_data_count(crc), crc->lock); + ret = wait_event_interruptible_lock_irq(crc->wq, + crtc_crc_data_count(crc), + crc->lock); spin_unlock_irq(&crc->lock); + WARN_ON(ret); + return 0; err_disable: -- 2.7.4