Commit bd008e5b authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm: Implement O_NONBLOCK support on /dev/dri/cardN

The implmentation is simple in the extreme: we only want to wait for
events if the device was opened in blocking mode, otherwise we grab what
is available and report an error if there was none.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Testcase: igt/kms_flip/nonblocing_read
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1bcecfac
...@@ -515,10 +515,12 @@ ssize_t drm_read(struct file *filp, char __user *buffer, ...@@ -515,10 +515,12 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
size_t total; size_t total;
ssize_t ret; ssize_t ret;
ret = wait_event_interruptible(file_priv->event_wait, if ((filp->f_flags & O_NONBLOCK) == 0) {
!list_empty(&file_priv->event_list)); ret = wait_event_interruptible(file_priv->event_wait,
if (ret < 0) !list_empty(&file_priv->event_list));
return ret; if (ret < 0)
return ret;
}
total = 0; total = 0;
while (drm_dequeue_event(file_priv, total, count, &e)) { while (drm_dequeue_event(file_priv, total, count, &e)) {
...@@ -532,7 +534,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer, ...@@ -532,7 +534,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
e->destroy(e); e->destroy(e);
} }
return total; return total ?: -EAGAIN;
} }
EXPORT_SYMBOL(drm_read); EXPORT_SYMBOL(drm_read);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment