similar to: [PATCH 1/2] nouveau: make nouveau importing global buffers completely thread-safe, with tests

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at ubuntu.com> --- xf86atomic.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xf86atomic.h b/xf86atomic.h index 8c4b696..17fb088 100644 --- a/xf86atomic.h +++ b/xf86atomic.h @@ -49,6 +49,7 @@ typedef struct { # define atomic_read(x) ((x)->atomic) # define atomic_set(x, val) ((x)->atomic = (val)) # define atomic_inc(x)

On 24 February 2015 at 09:01, Maarten Lankhorst <maarten.lankhorst at ubuntu.com> wrote: > Only add wrapped bo's and bo's that have been exported through flink or dma-buf. > This avoids a lock in the common case, and decreases traversal needed for importing > a dma-buf or flink. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at ubuntu.com> > --- >

On Wed, Feb 25, 2015 at 8:59 AM, Maarten Lankhorst < maarten.lankhorst at ubuntu.com> wrote: > Op 25-02-15 om 15:11 schreef Emil Velikov: > > On 24 February 2015 at 09:01, Maarten Lankhorst > > <maarten.lankhorst at ubuntu.com> wrote: > >> Only add wrapped bo's and bo's that have been exported through flink or > dma-buf. > >> This avoids a

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- nouveau/nouveau.c | 29 ++++++++++++++++++++++++++++- nouveau/private.h | 3 ++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index ee7893b..72c31cf 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -85,6 +85,12 @@ nouveau_device_wrap(int fd, int close, struct

On Wed, Feb 25, 2015 at 9:07 AM, Maarten Lankhorst < maarten.lankhorst at ubuntu.com> wrote: > Op 25-02-15 om 16:04 schreef Patrick Baggett: > > On Wed, Feb 25, 2015 at 8:59 AM, Maarten Lankhorst < > > maarten.lankhorst at ubuntu.com> wrote: > > > >> Op 25-02-15 om 15:11 schreef Emil Velikov: > >>> On 24 February 2015 at 09:01, Maarten

On 25-02-15 15:14, Emil Velikov wrote: > On 24 February 2015 at 09:01, Maarten Lankhorst > <maarten.lankhorst at ubuntu.com> wrote: >> While I've closed off most races in a previous patch, a small race still existed >> where importing then unreffing cound cause an invalid bo. Add a test for this case. >> >> Racing sequence fixed: >> >> - thread 1

On 24 February 2015 at 09:01, Maarten Lankhorst <maarten.lankhorst at ubuntu.com> wrote: > While I've closed off most races in a previous patch, a small race still existed > where importing then unreffing cound cause an invalid bo. Add a test for this case. > > Racing sequence fixed: > > - thread 1 releases bo, refcount drops to zero, blocks on acquiring nvdev->lock.

From: Ben Skeggs <bskeggs at redhat.com> Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- nouveau/abi16.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++----- nouveau/nouveau.c | 56 +++++++------------------------------------------ nouveau/private.h | 7 ++----- 3 files changed, 67 insertions(+), 58 deletions(-) diff --git a/nouveau/abi16.c b/nouveau/abi16.c index

Based on the original patch by Ilia Mirkin. Handle races between nouveau_bo_name_get, nouveau_bo_prime_handle_ref and unreffing. Because DRM_IOCTL_GEM_CLOSE is not refcounted, some special care was needed by holding the lock during some ioctls. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- ---

From: Ben Skeggs <bskeggs at redhat.com> This commit also modifies the install path of the main libdrm_nouveau header to be under a nouveau/ subdirectory. Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- include/drm/nouveau_drm.h | 1 + nouveau/Makefile.am | 11 +++- nouveau/libdrm_nouveau.pc.in | 2 +- nouveau/nvif/cl0080.h | 45 ++++++++++++++

Only add wrapped bo's and bo's that have been exported through flink or dma-buf. This avoids a lock in the common case, and decreases traversal needed for importing a dma-buf or flink. Signed-off-by: Maarten Lankhorst <maarten.lankhorst at ubuntu.com> --- nouveau/nouveau.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff

From: Ben Skeggs <bskeggs at redhat.com> This commit also modifies the install path of the main libdrm_nouveau header to be under a nouveau/ subdirectory. Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- include/drm/nouveau_drm.h | 1 + nouveau/Makefile.am | 11 +++- nouveau/libdrm_nouveau.pc.in | 2 +- nouveau/nvif/cl0080.h | 45 ++++++++++++++

Op 25-02-15 om 15:11 schreef Emil Velikov: > On 24 February 2015 at 09:01, Maarten Lankhorst > <maarten.lankhorst at ubuntu.com> wrote: >> Only add wrapped bo's and bo's that have been exported through flink or dma-buf. >> This avoids a lock in the common case, and decreases traversal needed for importing >> a dma-buf or flink. >> >> Signed-off-by:

Op 25-02-15 om 16:04 schreef Patrick Baggett: > On Wed, Feb 25, 2015 at 8:59 AM, Maarten Lankhorst < > maarten.lankhorst at ubuntu.com> wrote: > >> Op 25-02-15 om 15:11 schreef Emil Velikov: >>> On 24 February 2015 at 09:01, Maarten Lankhorst >>> <maarten.lankhorst at ubuntu.com> wrote: >>>> Only add wrapped bo's and bo's that have

Op 25-02-15 om 16:28 schreef Patrick Baggett: > On Wed, Feb 25, 2015 at 9:07 AM, Maarten Lankhorst < > maarten.lankhorst at ubuntu.com> wrote: > >> Op 25-02-15 om 16:04 schreef Patrick Baggett: >>> On Wed, Feb 25, 2015 at 8:59 AM, Maarten Lankhorst < >>> maarten.lankhorst at ubuntu.com> wrote: >>> >>>> Op 25-02-15 om 15:11 schreef

From: Ben Skeggs <bskeggs at redhat.com> The latter is deprecated, and will not be valid for newer clients. Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- nouveau/abi16.c | 32 +++++++++++++++----------------- nouveau/nouveau-symbol-check | 1 - nouveau/nouveau.c | 43 +++++++++++++++++++++---------------------- nouveau/nouveau.h | 1 -

This hides all the abi16_* functions and the nouveau_debug variable, they should have been private to begin with. Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- nouveau/Makefile.am | 1 + nouveau/bufctx.c | 10 +++++----- nouveau/nouveau.c | 40 ++++++++++++++++++++-------------------- nouveau/private.h | 1 + nouveau/pushbuf.c | 20

This patch changes the pushbuffer ABI to: 1. No longer use/expose nouveau_pushbuffer. Everything is directly in nouveau_channel. This saves the extra "pushbuf" pointer dereference. 2. Use cur/end pointers instead of tracking the remaining size. Pushing data now only needs to alter cur and not both cur and remaining. The goal is to make the *_RING macros faster and make the

Most Gallium drivers support nested mapping by using a reference count. We don't, and swtnl fallback triggers an error due to this. This patch adds this support in libdrm. --- nouveau/nouveau_bo.c | 8 +++++++- nouveau/nouveau_private.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/nouveau/nouveau_bo.c b/nouveau/nouveau_bo.c index 10cc8a6..c1a9843 100644

From: Marcin Slusarz <marcin.slusarz at gmail.com> Subject: [libdrm PATCH] nouveau: disable flush_notify on channel_free We don't want do call flush_notify when we will FIRE the RING a couple of lines later, because grobj bound to this channel might be already freed. --- nouveau/nouveau_channel.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git