Attachment 118094 Details for Bug 91890 – cb management patch

[patch] cb management patch

witcher2.patch (text/plain), 6.82 KB, created by Ilia Mirkin on 2015-09-06 05:43:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2015-09-06 05:43:26 UTC

Size: 6.82 KB

patch

obsolete

>diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c
>index 912b778..d334a04 100644
>--- a/src/gallium/drivers/nouveau/nouveau_buffer.c
>+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
>@@ -206,8 +206,8 @@ nouveau_transfer_write(struct nouveau_context *nv, struct nouveau_transfer *tx,
>       nv->copy_data(nv, buf->bo, buf->offset + base, buf->domain,
>                     tx->bo, tx->offset + offset, NOUVEAU_BO_GART, size);
>    else
>-   if ((buf->base.bind & PIPE_BIND_CONSTANT_BUFFER) && nv->push_cb && can_cb)
>-      nv->push_cb(nv, buf->bo, buf->domain, buf->offset, buf->base.width0,
>+   if (buf->cb_slot >= 0 && nv->push_cb && can_cb)
>+      nv->push_cb(nv, buf,
>                   base, size / 4, (const uint32_t *)data);
>    else
>       nv->push_data(nv, buf->bo, buf->offset + base, buf->domain, size, data);
>@@ -689,6 +689,7 @@ nouveau_buffer_create(struct pipe_screen *pscreen,
>    NOUVEAU_DRV_STAT(screen, buf_obj_current_count, 1);
> 
>    util_range_init(&buffer->valid_buffer_range);
>+   buffer->cb_slot = -1;
> 
>    return &buffer->base;
> 
>diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.h b/src/gallium/drivers/nouveau/nouveau_buffer.h
>index 7e6a6cc..93c4596 100644
>--- a/src/gallium/drivers/nouveau/nouveau_buffer.h
>+++ b/src/gallium/drivers/nouveau/nouveau_buffer.h
>@@ -41,6 +41,8 @@ struct nv04_resource {
>    uint8_t status;
>    uint8_t domain;
> 
>+   int16_t cb_slot; /* the current cb slot, if any */
>+
>    struct nouveau_fence *fence;
>    struct nouveau_fence *fence_wr;
> 
>diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h
>index 24deb7e..decb271 100644
>--- a/src/gallium/drivers/nouveau/nouveau_context.h
>+++ b/src/gallium/drivers/nouveau/nouveau_context.h
>@@ -6,6 +6,8 @@
> 
> #define NOUVEAU_MAX_SCRATCH_BUFS 4
> 
>+struct nv04_resource;
>+
> struct nouveau_context {
>    struct pipe_context pipe;
>    struct nouveau_screen *screen;
>@@ -23,8 +25,7 @@ struct nouveau_context {
>                      unsigned, const void *);
>    /* base, size refer to the whole constant buffer */
>    void (*push_cb)(struct nouveau_context *,
>-                   struct nouveau_bo *, unsigned domain,
>-                   unsigned base, unsigned size,
>+                   struct nv04_resource *,
>                    unsigned offset, unsigned words, const uint32_t *);
> 
>    /* @return: @ref reduced by nr of references found in context */
>diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>index 6ed79cf..30bee3a 100644
>--- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>@@ -299,10 +299,10 @@ nve4_p2mf_push_linear(struct nouveau_context *nv,
>                       struct nouveau_bo *dst, unsigned offset, unsigned domain,
>                       unsigned size, const void *data);
> void
>-nvc0_cb_push(struct nouveau_context *,
>-             struct nouveau_bo *bo, unsigned domain,
>-             unsigned base, unsigned size,
>-             unsigned offset, unsigned words, const uint32_t *data);
>+nvc0_cb_bo_push(struct nouveau_context *,
>+                struct nouveau_bo *bo, unsigned domain,
>+                unsigned base, unsigned size,
>+                unsigned offset, unsigned words, const uint32_t *data);
> 
> /* nvc0_vbo.c */
> void nvc0_draw_vbo(struct pipe_context *, const struct pipe_draw_info *);
>diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
>index ee29912..23d7561 100644
>--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
>+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
>@@ -831,6 +831,8 @@ nvc0_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
>    }
>    nvc0->constbuf_dirty[s] |= 1 << i;
> 
>+   if (nvc0->constbuf[s][i].u.buf)
>+      nv04_resource(res)->cb_slot = -1;
>    pipe_resource_reference(&nvc0->constbuf[s][i].u.buf, res);
> 
>    nvc0->constbuf[s][i].user = (cb && cb->user_buffer) ? true : false;
>diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
>index 47bd66d..12c51ff 100644
>--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
>+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
>@@ -440,7 +440,7 @@ nvc0_constbufs_validate(struct nvc0_context *nvc0)
>                BEGIN_NVC0(push, NVC0_3D(CB_BIND(s)), 1);
>                PUSH_DATA (push, (0 << 4) | 1);
>             }
>-            nvc0_cb_push(&nvc0->base, bo, NV_VRAM_DOMAIN(&nvc0->screen->base),
>+            nvc0_cb_bo_push(&nvc0->base, bo, NV_VRAM_DOMAIN(&nvc0->screen->base),
>                          base, nvc0->state.uniform_buffer_bound[s],
>                          0, (size + 3) / 4,
>                          nvc0->constbuf[s][0].u.data);
>@@ -458,6 +458,7 @@ nvc0_constbufs_validate(struct nvc0_context *nvc0)
>                BCTX_REFN(nvc0->bufctx_3d, CB(s, i), res, RD);
> 
>                nvc0->cb_dirty = 1; /* Force cache flush for UBO. */
>+               res->cb_slot = s | (i << 3);
>             } else {
>                BEGIN_NVC0(push, NVC0_3D(CB_BIND(s)), 1);
>                PUSH_DATA (push, (i << 4) | 0);
>diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c b/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c
>index 7cc5b4b..afb1f99 100644
>--- a/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c
>+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c
>@@ -506,12 +506,32 @@ nvc0_miptree_transfer_unmap(struct pipe_context *pctx,
> }
> 
> /* This happens rather often with DTD9/st. */
>-void
>+static void
> nvc0_cb_push(struct nouveau_context *nv,
>-             struct nouveau_bo *bo, unsigned domain,
>-             unsigned base, unsigned size,
>+             struct nv04_resource *res,
>              unsigned offset, unsigned words, const uint32_t *data)
> {
>+   struct nvc0_context *nvc0 = nvc0_context(&nv->pipe);
>+   struct nvc0_constbuf *cb;
>+
>+   assert(res->cb_slot >= 0);
>+
>+   cb = &nvc0->constbuf[res->cb_slot & 7][res->cb_slot >> 3];
>+
>+   if (offset + words * 4 <= cb->size) {
>+      nvc0_cb_bo_push(nv, res->bo, res->domain, res->offset + cb->offset, cb->size,
>+                      offset, words, data);
>+   } else {
>+      nv->push_data(nv, res->bo, res->offset + offset, res->domain, words * 4, data);
>+   }
>+}
>+
>+void
>+nvc0_cb_bo_push(struct nouveau_context *nv,
>+                struct nouveau_bo *bo, unsigned domain,
>+                unsigned base, unsigned size,
>+                unsigned offset, unsigned words, const uint32_t *data)
>+{
>    struct nouveau_pushbuf *push = nv->pushbuf;
> 
>    NOUVEAU_DRV_STAT(nv->screen, constbuf_upload_count, 1);
>@@ -520,6 +540,9 @@ nvc0_cb_push(struct nouveau_context *nv,
>    assert(!(offset & 3));
>    size = align(size, 0x100);
> 
>+   assert(offset < size);
>+   assert(offset + words * 4 <= size);
>+
>    BEGIN_NVC0(push, NVC0_3D(CB_SIZE), 3);
>    PUSH_DATA (push, size);
>    PUSH_DATAh(push, bo->offset + base);

Actions: View | Splinter Review

Attachments on bug 91890: 118091 | 118092 | 118094

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.