search for: pipe_mutex_unlock

..._t *map; @@ -426,15 +427,20 @@ nouveau_buffer_transfer_map(struct pipe_context *pipe, align_free(buf->data); buf->data = NULL; } + pipe_mutex_lock(screen->push_mutex); nouveau_transfer_staging(nv, tx, false); + pipe_mutex_unlock(screen->push_mutex); nouveau_transfer_read(nv, tx); } else { /* The buffer is currently idle. Create a staging area for writes, * and make sure that the cached data is up-to-date. */ if (usage & PIPE_TRANSFER_WRITE)...

...eference to the closed fd. We + * avoid this by duplicating the original fd. + */ + ret = nouveau_device_wrap(dup(fd), 1, &dev); if (ret) goto err; @@ -115,6 +123,8 @@ nouveau_drm_screen_create(int fd) return &screen->base; err: + if (dev) + nouveau_device_del(&dev); pipe_mutex_unlock(nouveau_screen_mutex); return NULL; } -- 1.8.5.5

From: Ben Skeggs <bskeggs at redhat.com> Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4016871..c02ee61 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ LIBDRM_RADEON_REQUIRED=2.4.56 LIBDRM_AMDGPU_REQUIRED=2.4.63 LIBDRM_INTEL_REQUIRED=2.4.61

From: Ben Skeggs <bskeggs at redhat.com> v2. forgot bump for non-gallium driver Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b6680d0..965c6f7 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,8 @@ LIBDRM_REQUIRED=2.4.60

...n) { > + screen->base.destroy(&screen->base); > + } else { > + if (dev) > + nouveau_device_del(&dev); > + else if (dupfd >= 0) > + close(dupfd); > + } > pipe_mutex_unlock(nouveau_screen_mutex); > return NULL; > } > -- > 2.6.3 > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau

From: Ben Skeggs <bskeggs at redhat.com> Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4016871..c02ee61 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ LIBDRM_RADEON_REQUIRED=2.4.56 LIBDRM_AMDGPU_REQUIRED=2.4.63 LIBDRM_INTEL_REQUIRED=2.4.61

...creen->base); >>> + } else { >>> + if (dev) >>> + nouveau_device_del(&dev); >>> + else if (dupfd >= 0) >>> + close(dupfd); >>> + } >>> pipe_mutex_unlock(nouveau_screen_mutex); >>> return NULL; >>> } >>> -- >>> 2.6.3 >>> >>> _______________________________________________ >>> Nouveau mailing list >>> Nouveau at lists.freedesktop.org >>> http://lists.freedesktop...

...return &screen->base; err: - if (dev) - nouveau_device_del(&dev); - else if (dupfd >= 0) - close(dupfd); + if (screen) { + screen->base.destroy(&screen->base); + } else { + if (dev) + nouveau_device_del(&dev); + else if (dupfd >= 0) + close(dupfd); + } pipe_mutex_unlock(nouveau_screen_mutex); return NULL; } -- 2.6.3

...reen->base.destroy(&screen->base); >> + } else { >> + if (dev) >> + nouveau_device_del(&dev); >> + else if (dupfd >= 0) >> + close(dupfd); >> + } >> pipe_mutex_unlock(nouveau_screen_mutex); >> return NULL; >> } >> -- >> 2.6.3 >> >> _______________________________________________ >> Nouveau mailing list >> Nouveau at lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/nouveau -----...