At Thu, 4 Dec 2014 12:46:16 +0100,
Daniel Vetter wrote:
>
> On Thu, Dec 04, 2014 at 11:56:42AM +0100, Takashi Iwai wrote:
> > Signed-off-by: Takashi Iwai <tiwai at suse.de>
>
> Applied to my drm-misc branch. The second patch seems to be a dupe of
>
> commit bd008e5b2953186fc0c6633a885ade95e7043800
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date: Tue Oct 7 14:13:51 2014 +0100
>
> drm: Implement O_NONBLOCK support on /dev/dri/cardN
>
> so maybe we should backport that one once it's landed in 3.19?
Ah thanks, I misread Chris' comment as if it were for libdrm, and now
understood correctly.
Takashi
> -Daniel
>
> > ---
> > drivers/gpu/drm/drm_fops.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
> > index ed7bc68f7e87..a82dc28d54f3 100644
> > --- a/drivers/gpu/drm/drm_fops.c
> > +++ b/drivers/gpu/drm/drm_fops.c
> > @@ -525,6 +525,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
> > if (copy_to_user(buffer + total,
> > e->event, e->event->length)) {
> > total = -EFAULT;
> > + e->destroy(e);
> > break;
> > }
> >
> > --
> > 2.1.3
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
