Attachment 107492 Details for Bug 84744 – O_NONBLOCK support on /dev/dri/cardN

[patch] O_NONBLOCK support on /dev/dri/cardN

0001-drm-nonblock.patch (text/plain), 1.12 KB, created by Chris Wilson on 2014-10-07 13:09:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-10-07 13:09:49 UTC

Size: 1.12 KB

patch

obsolete

>From 2dc436c9b625e7bee8fc00dc2185cddb60d567ad Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sat, 31 Aug 2013 00:38:37 +0100
>Subject: [PATCH] drm:nonblock
>
>---
> drivers/gpu/drm/drm_fops.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
>index ed7bc68..91e1105 100644
>--- a/drivers/gpu/drm/drm_fops.c
>+++ b/drivers/gpu/drm/drm_fops.c
>@@ -515,10 +515,12 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
> 	size_t total;
> 	ssize_t ret;
> 
>-	ret = wait_event_interruptible(file_priv->event_wait,
>-				       !list_empty(&file_priv->event_list));
>-	if (ret < 0)
>-		return ret;
>+	if ((filp->f_flags & O_NONBLOCK) == 0) {
>+		ret = wait_event_interruptible(file_priv->event_wait,
>+					       !list_empty(&file_priv->event_list));
>+		if (ret < 0)
>+			return ret;
>+	}
> 
> 	total = 0;
> 	while (drm_dequeue_event(file_priv, total, count, &e)) {
>@@ -532,7 +534,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
> 		e->destroy(e);
> 	}
> 
>-	return total;
>+	return total ?: -EAGAIN;
> }
> EXPORT_SYMBOL(drm_read);
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 84744: 107471 | 107472 | 107473 | 107480 | 107481 | 107483 | 107491 | 107492 | 107495

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.