similar to: [Bug 21908] New: SIGSEGV when no kernel DRM present

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> Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- nouveau/nouveau.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index 9f82fde..e304a1b 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -244,39 +244,36 @@

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> 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

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> > --- >

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

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

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.

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 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 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

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. - thread 2 increases refcount to 1. - thread 2 decreases refcount to zero, blocks on acquiring nvdev->lock. At this

I'm trying to build nouveau form git. The compile fails with: gcc -DHAVE_CONFIG_H -I. -I.. -D_XOPEN_SOURCE=500 -I -I/usr/include/pixman-1 -I/usr/include/drm -I/usr/include/X11/dri -g -O2 -Wall -minline-all-stringops -D_XOPEN_SOURCE=500 -I -I/usr/include/pixman-1 -I/usr/include/drm -I/usr/include/X11/dri -MT nouveau_device.lo -MD -MP -MF .deps/nouveau_device.Tpo -c nouveau_device.c -fPIC -DPIC

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

On Sun, 13 Sep 2009 20:06:59 -0700 (PDT) darktama at kemper.freedesktop.org (Ben Skeggs) wrote: > src/drmmode_display.c | 6 ++++++ > src/nv_driver.c | 2 ++ > 2 files changed, 8 insertions(+) > > New commits: > commit 6c045fc44783454180d7b3d00b5f25436bd5544e > Author: Ben Skeggs <bskeggs at redhat.com> > Date: Mon Sep 14 13:04:12 2009 +1000 >

Introduce accessors for TTM buffer object memory that has been mapped into the kernel virtual address space or as IO memory. IO memory needs to be accessed via special accessor functions, not by dereferencing the iomem cookie. The wrappers hide the details of 32-bit access and honour the TTM map type. nv04_crtc_cursor_set() is changed to use the new wrappers. 'cursor' is received from

Revised patch set v2. [PATCH 1/8] drm/nouveau: bo read/write wrappers for nv04_crtc.c [PATCH 2/8] drm/nouveau: use bo accessors for push buffers [PATCH 3/8] drm/nouveau: OUT_RINGp - optimize OUT_RING loops [PATCH 4/8] drm/nv50: proper notifier_bo access in nv50_display_vblank_crtc_handler() [PATCH 5/8] drm/nouveau: access fbcon notifier via bo accessors [PATCH 6/8] drm/nouveau: screen_base and