Skip to contentSkip to conversation

nv50: remove vtxbuf stateobject after a referenced vtxbuf is mapped

PATCH In review Maarten Maathuis 3 participants 4 messages Dec 20, 2009 – Dec 21, 2009 3 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nv50: remove vtxbuf stateobject after a referenced vtxbuf is mapped

- This avoids problematic "reloc'ed while mapped" messages and some associated corruption as well.
- Also add one nouveau_bo_unmap() in the vbo code that wasn't present.

---
 src/gallium/drivers/nouveau/nouveau_screen.c   |   21 +++++++++++++++++++++
 src/gallium/drivers/nouveau/nouveau_screen.h   |    3 +++
 src/gallium/drivers/nouveau/nouveau_stateobj.h |   13 +++++++++++++
 src/gallium/drivers/nv50/nv50_screen.c         |   23 +++++++++++++++++++++++
 src/gallium/drivers/nv50/nv50_screen.h         |    2 ++
 src/gallium/drivers/nv50/nv50_state_validate.c |    2 ++
 src/gallium/drivers/nv50/nv50_vbo.c            |    4 +++-
 7 files changed, 67 insertions(+), 1 deletions(-)
src/gallium/drivers/nouveau/nouveau_screen.c +21 -0
index e4cf91c..c85057a 100644
@@ -127,8 +127,18 @@ nouveau_screen_bo_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
 		      unsigned usage)
 {
 	struct nouveau_bo *bo = nouveau_bo(pb);
+	struct nouveau_screen *nscreen = nouveau_screen(pscreen);
 	int ret;
 
+	if (nscreen->pre_pipebuffer_map_callback) {
+		ret = nscreen->pre_pipebuffer_map_callback(pscreen, pb, usage);
+		if (ret) {
+			debug_printf("pre_pipebuffer_map_callback failed %d\n",
+				ret);
+			return NULL;
+		}
+	}
+
 	ret = nouveau_bo_map(bo, nouveau_screen_map_flags(usage));
 	if (ret) {
 		debug_printf("map failed: %d\n", ret);
@@ -143,11 +153,22 @@ nouveau_screen_bo_map_range(struct pipe_screen *pscreen, struct pipe_buffer *pb,
 			    unsigned offset, unsigned length, unsigned usage)
 {
 	struct nouveau_bo *bo = nouveau_bo(pb);
+	struct nouveau_screen *nscreen = nouveau_screen(pscreen);
 	uint32_t flags = nouveau_screen_map_flags(usage);
 	int ret;
 
+	if (nscreen->pre_pipebuffer_map_callback) {
+		ret = nscreen->pre_pipebuffer_map_callback(pscreen, pb, usage);
+		if (ret) {
+			debug_printf("pre_pipebuffer_map_callback failed %d\n",
+				ret);
+			return NULL;
+		}
+	}
+
 	ret = nouveau_bo_map_range(bo, offset, length, flags);
 	if (ret) {
+		nouveau_bo_unmap(bo);
 		if (!(flags & NOUVEAU_BO_NOWAIT) || ret != -EBUSY)
 			debug_printf("map_range failed: %d\n", ret);
 		return NULL;
src/gallium/drivers/nouveau/nouveau_screen.h +3 -0
index ebfc67a..a7927d8 100644
@@ -5,6 +5,9 @@ struct nouveau_screen {
 	struct pipe_screen base;
 	struct nouveau_device *device;
 	struct nouveau_channel *channel;
+
+	int (*pre_pipebuffer_map_callback) (struct pipe_screen *pscreen,
+		struct pipe_buffer *pb, unsigned usage);
 };
 
 static inline struct nouveau_screen *
src/gallium/drivers/nouveau/nouveau_stateobj.h +13 -0
index 9aee9e4..f4c32d7 100644
@@ -98,6 +98,19 @@ so_reloc(struct nouveau_stateobj *so, struct nouveau_bo *bo,
 	so_data(so, data);
 }
 
+/* Determine if this buffer object is referenced by this state object. */
+static INLINE bool
+so_bo_is_reloc(struct nouveau_stateobj *so, struct nouveau_bo *bo)
+{
+	int i;
+
+	for (i = 0; i < so->cur_reloc; i++) 
+		if (so->reloc[i].bo == bo) 
+			return true;
+
+	return false;
+}
+
 static INLINE void
 so_dump(struct nouveau_stateobj *so)
 {
src/gallium/drivers/nv50/nv50_screen.c +23 -0
index d443ca3..79f47d9 100644
@@ -174,6 +174,28 @@ nv50_screen_destroy(struct pipe_screen *pscreen)
 	FREE(screen);
 }
 
+static int
+nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
+	unsigned usage)
+{
+	struct nv50_screen *screen = nv50_screen(pscreen);
+	struct nv50_context *ctx = screen->cur_ctx;
+
+	if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX))
+		return 0;
+
+	/* Our vtxbuf got mapped, it can no longer be considered part of current
+	 * state, remove it to avoid emitting reloc markers.
+	 */
+	if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf,
+			nouveau_bo(pb))) {
+		so_ref(NULL, &ctx->state.vtxbuf);
+		ctx->state.dirty |= NV50_NEW_ARRAYS;
+	}
+
+	return 0;
+}
+
 struct pipe_screen *
 nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 {
@@ -201,6 +223,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 	pscreen->get_param = nv50_screen_get_param;
 	pscreen->get_paramf = nv50_screen_get_paramf;
 	pscreen->is_format_supported = nv50_screen_is_format_supported;
+	screen->base.pre_pipebuffer_map_callback = nv50_pre_pipebuffer_map;
 
 	nv50_screen_init_miptree_functions(pscreen);
 	nv50_transfer_init_screen_functions(pscreen);
src/gallium/drivers/nv50/nv50_screen.h +2 -0
index 61e24a5..a038a4e 100644
@@ -2,6 +2,7 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
+#include "nv50_context.h"
 
 struct nv50_screen {
 	struct nouveau_screen base;
@@ -9,6 +10,7 @@ struct nv50_screen {
 	struct nouveau_winsys *nvws;
 
 	unsigned cur_pctx;
+	struct nv50_context *cur_ctx;
 
 	struct nouveau_grobj *tesla;
 	struct nouveau_grobj *eng2d;
src/gallium/drivers/nv50/nv50_state_validate.c +2 -0
index 871e809..8cf4ff4 100644
@@ -185,6 +185,8 @@ nv50_state_emit(struct nv50_context *nv50)
 	struct nv50_screen *screen = nv50->screen;
 	struct nouveau_channel *chan = screen->base.channel;
 
+	screen->cur_ctx = nv50;
+
 	if (nv50->pctx_id != screen->cur_pctx) {
 		if (nv50->state.fb)
 			nv50->state.dirty |= NV50_NEW_FRAMEBUFFER;
src/gallium/drivers/nv50/nv50_vbo.c +3 -1
index db54380..ce6e4eb 100644
@@ -325,8 +325,10 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
 		return FALSE;
 
 	ret = nouveau_bo_map(bo, NOUVEAU_BO_RD);
-	if (ret)
+	if (ret) {
+		nouveau_bo_unmap(bo);
 		return FALSE;
+	}
 	v = (float *)(bo->map + (vb->buffer_offset + ve->src_offset));
 
 	so = *pso;
Signature · 1 line
1.6.5.4

A message that is not in the archive (sent off-list or not yet received): 1261323978-5330-1-git-send-email-madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 3 lines · Maarten Maathuis

- This avoids problematic "reloc'ed while mapped" messages and some associated corruption as well.
- Also add one nouveau_bo_unmap() in the vbo code that wasn't present.

I didn't think nouveau_bo_unmap was necessary if the map failed. As far as I can see, map will be NULL, and unmap will do nothing. I don't know what our API doc says about that though ... But the DDX seems to not unmap after failure.

Quoted 18 lines
---
 src/gallium/drivers/nouveau/nouveau_screen.c   |   21 +++++++++++++++++++++
 src/gallium/drivers/nouveau/nouveau_screen.h   |    3 +++
 src/gallium/drivers/nouveau/nouveau_stateobj.h |   13 +++++++++++++
 src/gallium/drivers/nv50/nv50_screen.c         |   23 +++++++++++++++++++++++
 src/gallium/drivers/nv50/nv50_screen.h         |    2 ++
 src/gallium/drivers/nv50/nv50_state_validate.c |    2 ++
 src/gallium/drivers/nv50/nv50_vbo.c            |    4 +++-
 7 files changed, 67 insertions(+), 1 deletions(-)
src/gallium/drivers/nouveau/nouveau_screen.c +0 -0
index e4cf91c..c85057a 100644
@@ -127,8 +127,18 @@ nouveau_screen_bo_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
 		      unsigned usage)

...

Quoted 7 lines
src/gallium/drivers/nouveau/nouveau_screen.c +7 -0
+static int
+nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
+	unsigned usage)
+{
+	struct nv50_screen *screen = nv50_screen(pscreen);
+	struct nv50_context *ctx = screen->cur_ctx;
+

src/gallium/drivers/nouveau/nouveau_screen.c

Quoted 10 lines
src/gallium/drivers/nouveau/nouveau_screen.c +10 -0
+	if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX))
+		return 0;
+
+	/* Our vtxbuf got mapped, it can no longer be considered part of current
+	 * state, remove it to avoid emitting reloc markers.
+	 */
+	if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf,
+			nouveau_bo(pb))) {
+		so_ref(NULL, &ctx->state.vtxbuf);
+		ctx->state.dirty |= NV50_NEW_ARRAYS;

Hm ... I know I suggested it but I'm not completely sure it works now. ctx->state.dirty will be checked in nv50_state_emit as far as I can see, and then state stateobj better not be NULL.
(at least if I do this regardless of so_bo_is_reloc, I get a segfault)

Since we're operating on the current context here, we should probably set ctx->(no state.)dirty which is used in nv50_state_validate (no segfault on emit then).

Quoted 29 lines
src/gallium/drivers/nouveau/nouveau_screen.c +6 -0
+	}
+
+	return 0;
+}
+
 struct pipe_screen *
 nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 {
@@ -201,6 +223,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 	pscreen->get_param = nv50_screen_get_param;
 	pscreen->get_paramf = nv50_screen_get_paramf;
 	pscreen->is_format_supported = nv50_screen_is_format_supported;
+	screen->base.pre_pipebuffer_map_callback = nv50_pre_pipebuffer_map;
 
 	nv50_screen_init_miptree_functions(pscreen);
 	nv50_transfer_init_screen_functions(pscreen);
src/gallium/drivers/nv50/nv50_screen.h +1 -0
index 61e24a5..a038a4e 100644
@@ -2,6 +2,7 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
+#include "nv50_context.h"
 
 struct nv50_screen {
 	struct nouveau_screen base;

src/gallium/drivers/nv50/nv50_screen.h struct nv50_screen { · line 14

Quoted 5 lines
src/gallium/drivers/nv50/nv50_screen.h +1 -0
@@ -9,6 +10,7 @@ struct nv50_screen {
 	struct nouveau_winsys *nvws;
 
 	unsigned cur_pctx;
+	struct nv50_context *cur_ctx;
 

Using struct pipe_context **nouveau_winsys::pcxt would work too ...

Quoted 31 lines
src/gallium/drivers/nv50/nv50_screen.h +0 -0
 	struct nouveau_grobj *tesla;
 	struct nouveau_grobj *eng2d;
src/gallium/drivers/nv50/nv50_state_validate.c +2 -0
index 871e809..8cf4ff4 100644
@@ -185,6 +185,8 @@ nv50_state_emit(struct nv50_context *nv50)
 	struct nv50_screen *screen = nv50->screen;
 	struct nouveau_channel *chan = screen->base.channel;
 
+	screen->cur_ctx = nv50;
+
 	if (nv50->pctx_id != screen->cur_pctx) {
 		if (nv50->state.fb)
 			nv50->state.dirty |= NV50_NEW_FRAMEBUFFER;
src/gallium/drivers/nv50/nv50_vbo.c +3 -1
index db54380..ce6e4eb 100644
@@ -325,8 +325,10 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
 		return FALSE;
 
 	ret = nouveau_bo_map(bo, NOUVEAU_BO_RD);
-	if (ret)
+	if (ret) {
+		nouveau_bo_unmap(bo);
 		return FALSE;
+	}
 	v = (float *)(bo->map + (vb->buffer_offset + ve->src_offset));
 
 	so = *pso;

A message that is not in the archive (sent off-list or not yet received): 4B2F4D04.1000101-oe7qfRrRQffzPE21tAIdciO7C/[email protected]

#4 lore raw
Quoted 83 lines · Christoph Bumiller
Quoted 3 lines · Maarten Maathuis

- This avoids problematic "reloc'ed while mapped" messages and some associated corruption as well.
- Also add one nouveau_bo_unmap() in the vbo code that wasn't present.

I didn't think nouveau_bo_unmap was necessary if the map failed. As far as I can see, map will be NULL, and unmap will do nothing. I don't know what our API doc says about that though ... But the DDX seems to not unmap after failure.

Quoted 18 lines

---
 src/gallium/drivers/nouveau/nouveau_screen.c   |   21 +++++++++++++++++++++ src/gallium/drivers/nouveau/nouveau_screen.h   |    3 +++ src/gallium/drivers/nouveau/nouveau_stateobj.h |   13 +++++++++++++ src/gallium/drivers/nv50/nv50_screen.c         |   23 +++++++++++++++++++++++ src/gallium/drivers/nv50/nv50_screen.h         |    2 ++ src/gallium/drivers/nv50/nv50_state_validate.c |    2 ++ src/gallium/drivers/nv50/nv50_vbo.c            |    4 +++-

 7 files changed, 67 insertions(+), 1 deletions(-)
src/gallium/drivers/nouveau/nouveau_screen.c +0 -0
index e4cf91c..c85057a 100644
@@ -127,8 +127,18 @@ nouveau_screen_bo_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
                     unsigned usage)

...

Quoted 7 lines
src/gallium/drivers/nouveau/nouveau_screen.c +7 -0
+static int
+nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
+     unsigned usage)
+{
+     struct nv50_screen *screen = nv50_screen(pscreen);
+     struct nv50_context *ctx = screen->cur_ctx;
+

src/gallium/drivers/nouveau/nouveau_screen.c

Quoted 10 lines
src/gallium/drivers/nouveau/nouveau_screen.c +10 -0
+     if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX))
+             return 0;
+
+     /* Our vtxbuf got mapped, it can no longer be considered part of current
+      * state, remove it to avoid emitting reloc markers.
+      */
+     if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf,
+                     nouveau_bo(pb))) {
+             so_ref(NULL, &ctx->state.vtxbuf);
+             ctx->state.dirty |= NV50_NEW_ARRAYS;

Hm ... I know I suggested it but I'm not completely sure it works now. ctx->state.dirty will be checked in nv50_state_emit as far as I can see, and then state stateobj better not be NULL.
(at least if I do this regardless of so_bo_is_reloc, I get a segfault)

Since we're operating on the current context here, we should probably set ctx->(no state.)dirty which is used in nv50_state_validate (no segfault on emit then).

Quoted 31 lines

+     }

src/gallium/drivers/nouveau/nouveau_screen.c +4 -0
+
+     return 0;
+}
+

 struct pipe_screen *
 nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) {

src/gallium/drivers/nouveau/nouveau_screen.c +1 -0
@@ -201,6 +223,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
       pscreen->get_param = nv50_screen_get_param;
       pscreen->get_paramf = nv50_screen_get_paramf;
       pscreen->is_format_supported = nv50_screen_is_format_supported;
+     screen->base.pre_pipebuffer_map_callback = nv50_pre_pipebuffer_map;
 
       nv50_screen_init_miptree_functions(pscreen);
       nv50_transfer_init_screen_functions(pscreen);
src/gallium/drivers/nv50/nv50_screen.h +1 -0
index 61e24a5..a038a4e 100644
@@ -2,6 +2,7 @@
  #define __NV50_SCREEN_H__
 
  #include "nouveau/nouveau_screen.h"
+#include "nv50_context.h"
 
  struct nv50_screen {
       struct nouveau_screen base;
@@ -9,6 +10,7 @@ struct nv50_screen {
       struct nouveau_winsys *nvws;
 
Quoted 4 lines

src/gallium/drivers/nv50/nv50_screen.h struct nv50_screen { · line 14

Quoted 3 lines
src/gallium/drivers/nv50/nv50_screen.h +1 -0
       unsigned cur_pctx;
+     struct nv50_context *cur_ctx;
 

Using struct pipe_context **nouveau_winsys::pcxt would work too ...

Is this a C++ feature?

Quoted 34 lines
Quoted 32 lines
src/gallium/drivers/nv50/nv50_screen.h +0 -0
       struct nouveau_grobj *tesla;
       struct nouveau_grobj *eng2d;
src/gallium/drivers/nv50/nv50_state_validate.c +2 -0
index 871e809..8cf4ff4 100644
@@ -185,6 +185,8 @@ nv50_state_emit(struct nv50_context *nv50)
       struct nv50_screen *screen = nv50->screen;
       struct nouveau_channel *chan = screen->base.channel;
 
+     screen->cur_ctx = nv50;
+
       if (nv50->pctx_id != screen->cur_pctx) {
               if (nv50->state.fb)
                       nv50->state.dirty |= NV50_NEW_FRAMEBUFFER;
src/gallium/drivers/nv50/nv50_vbo.c +3 -1
index db54380..ce6e4eb 100644
@@ -325,8 +325,10 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
               return FALSE;
 
       ret = nouveau_bo_map(bo, NOUVEAU_BO_RD);
-     if (ret)
+     if (ret) {
+             nouveau_bo_unmap(bo);
               return FALSE;
+     }
       v = (float *)(bo->map + (vb->buffer_offset + ve->src_offset));
 
       so = *pso;

A message that is not in the archive (sent off-list or not yet received): 6d4bc9fc0912210548v24ce667exd2d8343b774641a6-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw
Quoted 85 lines · Maarten Maathuis
Quoted 83 lines · Christoph Bumiller
Quoted 3 lines · Maarten Maathuis

- This avoids problematic "reloc'ed while mapped" messages and some associated corruption as well.
- Also add one nouveau_bo_unmap() in the vbo code that wasn't present.

I didn't think nouveau_bo_unmap was necessary if the map failed. As far as I can see, map will be NULL, and unmap will do nothing. I don't know what our API doc says about that though ... But the DDX seems to not unmap after failure.

Quoted 18 lines
---
 src/gallium/drivers/nouveau/nouveau_screen.c   |   21 +++++++++++++++++++++
 src/gallium/drivers/nouveau/nouveau_screen.h   |    3 +++
 src/gallium/drivers/nouveau/nouveau_stateobj.h |   13 +++++++++++++
 src/gallium/drivers/nv50/nv50_screen.c         |   23 +++++++++++++++++++++++
 src/gallium/drivers/nv50/nv50_screen.h         |    2 ++
 src/gallium/drivers/nv50/nv50_state_validate.c |    2 ++
 src/gallium/drivers/nv50/nv50_vbo.c            |    4 +++-
 7 files changed, 67 insertions(+), 1 deletions(-)
src/gallium/drivers/nouveau/nouveau_screen.c +0 -0
index e4cf91c..c85057a 100644
@@ -127,8 +127,18 @@ nouveau_screen_bo_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
                    unsigned usage)

...

Quoted 7 lines
src/gallium/drivers/nouveau/nouveau_screen.c +7 -0
+static int
+nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb,
+     unsigned usage)
+{
+     struct nv50_screen *screen = nv50_screen(pscreen);
+     struct nv50_context *ctx = screen->cur_ctx;
+

src/gallium/drivers/nouveau/nouveau_screen.c

Quoted 10 lines
src/gallium/drivers/nouveau/nouveau_screen.c +10 -0
+     if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX))
+             return 0;
+
+     /* Our vtxbuf got mapped, it can no longer be considered part of current
+      * state, remove it to avoid emitting reloc markers.
+      */
+     if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf,
+                     nouveau_bo(pb))) {
+             so_ref(NULL, &ctx->state.vtxbuf);
+             ctx->state.dirty |= NV50_NEW_ARRAYS;

Hm ... I know I suggested it but I'm not completely sure it works now. ctx->state.dirty will be checked in nv50_state_emit as far as I can see, and then state stateobj better not be NULL.
(at least if I do this regardless of so_bo_is_reloc, I get a segfault)

Since we're operating on the current context here, we should probably set ctx->(no state.)dirty which is used in nv50_state_validate (no segfault on emit then).

Quoted 31 lines
src/gallium/drivers/nouveau/nouveau_screen.c +6 -0
+     }
+
+     return 0;
+}
+
 struct pipe_screen *
 nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 {
@@ -201,6 +223,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
      pscreen->get_param = nv50_screen_get_param;
      pscreen->get_paramf = nv50_screen_get_paramf;
      pscreen->is_format_supported = nv50_screen_is_format_supported;
+     screen->base.pre_pipebuffer_map_callback = nv50_pre_pipebuffer_map;
 
      nv50_screen_init_miptree_functions(pscreen);
      nv50_transfer_init_screen_functions(pscreen);
src/gallium/drivers/nv50/nv50_screen.h +1 -0
index 61e24a5..a038a4e 100644
@@ -2,6 +2,7 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
+#include "nv50_context.h"
 
 struct nv50_screen {
      struct nouveau_screen base;
@@ -9,6 +10,7 @@ struct nv50_screen {
      struct nouveau_winsys *nvws;
 
Quoted 7 lines
Quoted 4 lines

src/gallium/drivers/nv50/nv50_screen.h struct nv50_screen { · line 14

Quoted 3 lines
src/gallium/drivers/nv50/nv50_screen.h +1 -0
      unsigned cur_pctx;
+     struct nv50_context *cur_ctx;
 

Using struct pipe_context **nouveau_winsys::pcxt would work too ...

Is this a C++ feature?

nv50_screen->nvws->pctx[nv50_screen->cur_pctx] == pipe_context*