[Mesa-dev] [PATCH 1/8] nvc0: bind images on fragment and compute shaders for Fermi
Ilia Mirkin
imirkin at alum.mit.edu
Sat May 14 14:37:43 UTC 2016
On Sat, May 14, 2016 at 9:54 AM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
> src/gallium/drivers/nouveau/nvc0/nvc0_compute.c | 53 ++++++++
> src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 1 +
> src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 8 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 154 +++++++++++++++++++++++-
> 4 files changed, 209 insertions(+), 7 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
> index bbc8edb..78ce000 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
> @@ -258,6 +258,45 @@ nvc0_compute_validate_globals(struct nvc0_context *nvc0)
> }
> }
>
> +static inline void
> +nvc0_compute_invalidate_surfaces(struct nvc0_context *nvc0, const int s)
> +{
> + struct nouveau_pushbuf *push = nvc0->base.pushbuf;
> + int i;
> +
> + for (i = 0; i < NVC0_MAX_IMAGES; ++i) {
> + if (s == 5)
> + BEGIN_NVC0(push, NVC0_CP(IMAGE(i)), 6);
> + else
> + BEGIN_NVC0(push, NVC0_3D(IMAGE(i)), 6);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0x14000);
> + PUSH_DATA(push, 0);
> + }
> +}
> +
> +static void
> +nvc0_compute_validate_surfaces(struct nvc0_context *nvc0)
> +{
> + /* TODO: Invalidating both 3D and CP surfaces before validating surfaces for
> + * compute is probably not really necessary, but we didn't find any better
> + * solutions for now. This fixes some invalidation issues when compute and
> + * fragment shaders are used inside the same context. Anyway, we definitely
> + * have invalidation issues between 3D and CP for other resources like SSBO
> + * and atomic counters. */
> + nvc0_compute_invalidate_surfaces(nvc0, 4);
> + nvc0_compute_invalidate_surfaces(nvc0, 5);
> +
> + nvc0_validate_suf(nvc0, 5);
> +
> + /* Invalidate all FRAGMENT images because they are aliased with COMPUTE. */
> + nvc0->dirty_3d |= NVC0_NEW_3D_SURFACES;
> + nvc0->images_dirty[4] |= nvc0->images_valid[4];
> +}
> +
> static struct nvc0_state_validate
> validate_list_cp[] = {
> { nvc0_compprog_validate, NVC0_NEW_CP_PROGRAM },
> @@ -267,6 +306,7 @@ validate_list_cp[] = {
> { nvc0_compute_validate_textures, NVC0_NEW_CP_TEXTURES },
> { nvc0_compute_validate_samplers, NVC0_NEW_CP_SAMPLERS },
> { nvc0_compute_validate_globals, NVC0_NEW_CP_GLOBALS },
> + { nvc0_compute_validate_surfaces, NVC0_NEW_CP_SURFACES },
> };
>
> static bool
> @@ -384,6 +424,19 @@ nvc0_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
> PUSH_DATA (push, 0x1);
> }
>
> + for (int i = 0; i < NVC0_MAX_IMAGES; ++i) {
> + BEGIN_NVC0(push, NVC0_CP(IMAGE(i)), 6);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0x14000);
> + PUSH_DATA(push, 0);
> + }
> +
> + /* TODO: Not sure if this is really necessary. */
> + nvc0_compute_invalidate_surfaces(nvc0, 5);
Errr... so you're doing this 2x? Did you mean to get rid of the loop above?
> +
> /* Invalidate all 3D constbufs because they are aliased with COMPUTE. */
> nvc0->dirty_3d |= NVC0_NEW_3D_CONSTBUF;
> for (s = 0; s < 5; s++) {
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> index 7fcbf4a..436e912 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> @@ -323,6 +323,7 @@ extern void nvc0_init_surface_functions(struct nvc0_context *);
> bool nvc0_validate_tic(struct nvc0_context *nvc0, int s);
> bool nvc0_validate_tsc(struct nvc0_context *nvc0, int s);
> bool nve4_validate_tsc(struct nvc0_context *nvc0, int s);
> +void nvc0_validate_suf(struct nvc0_context *nvc0, int s);
> void nvc0_validate_textures(struct nvc0_context *);
> void nvc0_validate_samplers(struct nvc0_context *);
> void nve4_set_tex_handles(struct nvc0_context *);
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> index 9db45c0..9e214a5 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> @@ -552,22 +552,18 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset,
> info->io.texBindBase = NVC0_CB_AUX_TEX_INFO(0);
> info->prop.cp.gridInfoBase = NVC0_CB_AUX_GRID_INFO;
> info->io.uboInfoBase = NVC0_CB_AUX_UBO_INFO(0);
> - info->io.suInfoBase = NVC0_CB_AUX_SU_INFO(0);
> - } else {
> - info->io.suInfoBase = 0; /* TODO */
> }
> info->io.msInfoCBSlot = 0;
> info->io.msInfoBase = NVC0_CB_AUX_MS_INFO;
> info->io.bufInfoBase = NVC0_CB_AUX_BUF_INFO(0);
> + info->io.suInfoBase = NVC0_CB_AUX_SU_INFO(0);
> } else {
> if (chipset >= NVISA_GK104_CHIPSET) {
> info->io.texBindBase = NVC0_CB_AUX_TEX_INFO(0);
> - info->io.suInfoBase = NVC0_CB_AUX_SU_INFO(0);
> - } else {
> - info->io.suInfoBase = 0; /* TODO */
> }
> info->io.sampleInfoBase = NVC0_CB_AUX_SAMPLE_INFO;
> info->io.bufInfoBase = NVC0_CB_AUX_BUF_INFO(0);
> + info->io.suInfoBase = NVC0_CB_AUX_SU_INFO(0);
> info->io.msInfoCBSlot = 15;
> info->io.msInfoBase = 0; /* TODO */
> }
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
> index 28f48bf..668cd18 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
> @@ -915,9 +915,161 @@ nve4_set_surface_info(struct nouveau_pushbuf *push,
> }
>
> static inline void
> +nvc0_set_surface_info(struct nouveau_pushbuf *push,
> + struct pipe_image_view *view, uint64_t address,
> + int width, int height, int depth)
> +{
> + struct nv04_resource *res;
> + uint32_t *const info = push->cur;
> +
> + push->cur += 16;
> +
> + /* Make sure to always initialize the surface information area because it's
> + * used to check if the given image is bound or not. */
> + memset(info, 0, 16 * sizeof(*info));
> +
> + if (!view || !view->resource)
> + return;
> + res = nv04_resource(view->resource);
> +
> + /* Stick the image dimensions for the imageSize() builtin. */
> + info[8] = width;
> + info[9] = height;
> + info[10] = depth;
> +
> + /* Stick the blockwidth (ie. number of bytes per pixel) to calculate pixel
> + * offset and to check if the format doesn't mismatch. */
> + info[12] = util_format_get_blocksize(view->format);
> +
> + if (res->base.target == PIPE_BUFFER) {
> + info[0] = address >> 8;
> + info[2] = width;
> + } else {
> + struct nv50_miptree *mt = nv50_miptree(&res->base);
> +
> + info[0] = address >> 8;
> + info[2] = width;
> + info[4] = height;
> + info[5] = mt->layer_stride >> 8;
> + info[6] = depth;
> + info[14] = mt->ms_x;
> + info[15] = mt->ms_y;
> + }
> +}
> +
> +void
> +nvc0_validate_suf(struct nvc0_context *nvc0, int s)
> +{
> + struct nouveau_pushbuf *push = nvc0->base.pushbuf;
> + struct nvc0_screen *screen = nvc0->screen;
> +
> + if (!nvc0->images_dirty[s]) {
> + /* Images are aliased between 3D and COMPUTE, but we must not reset the
> + * state when no images are bound */
When no images are bound? That's not images_dirty. That's
images_valid. Is that why you're having all those invalidation issues?
> + return;
> + }
> +
> + for (int i = 0; i < NVC0_MAX_IMAGES; ++i) {
> + struct pipe_image_view *view = &nvc0->images[s][i];
> + int width, height, depth;
> + uint64_t address = 0;
> +
> + if (s == 5)
> + BEGIN_NVC0(push, NVC0_CP(IMAGE(i)), 6);
> + else
> + BEGIN_NVC0(push, NVC0_3D(IMAGE(i)), 6);
> +
> + if (view->resource) {
> + struct nv04_resource *res = nv04_resource(view->resource);
> + unsigned rt = nvc0_format_table[view->format].rt;
> +
> + if (util_format_is_depth_or_stencil(view->format))
> + rt = rt << 12;
> + else
> + rt = (rt << 4) | (0x14 << 12);
> +
> + /* get surface dimensions based on the target. */
> + nvc0_get_surface_dims(view, &width, &height, &depth);
> +
> + address = res->address;
> + if (res->base.target == PIPE_BUFFER) {
> + unsigned blocksize = util_format_get_blocksize(view->format);
> +
> + address += view->u.buf.first_element * blocksize;
> + assert(!(address & 0xff));
> +
> + PUSH_DATAh(push, address);
> + PUSH_DATA (push, address);
> + PUSH_DATA (push, align(width * blocksize, 0x100));
> + PUSH_DATA (push, NVC0_3D_IMAGE_HEIGHT_LINEAR | 1);
> + PUSH_DATA (push, rt);
> + PUSH_DATA (push, 0);
> + } else {
> + struct nv50_miptree *mt = nv50_miptree(view->resource);
> + struct nv50_miptree_level *lvl = &mt->level[view->u.tex.level];
> + const unsigned z = view->u.tex.first_layer;
> +
> + if (z) {
> + if (mt->layout_3d) {
> + address += nvc0_mt_zslice_offset(mt, view->u.tex.level, z);
> + if (depth >= 1) {
> + pipe_debug_message(&nvc0->base.debug, CONFORMANCE,
> + "3D images are not supported!");
> + debug_printf("3D images are not supported!\n");
Actually I'd print these at a higher level, not just if (z). Even if z
== 0, as long as lvl->tile_mode & 0xf00, 3d images will still suck.
> + }
> + } else {
> + address += mt->layer_stride * z;
> + }
> + }
> + address += lvl->offset;
> +
> + PUSH_DATAh(push, address);
> + PUSH_DATA (push, address);
> + PUSH_DATA (push, width);
> + PUSH_DATA (push, height);
> + PUSH_DATA (push, rt);
> + PUSH_DATA (push, lvl->tile_mode & 0xff); /* mask out z-tiling */
> + }
> +
> + if (s == 5)
> + BCTX_REFN(nvc0->bufctx_cp, CP_SUF, res, RDWR);
> + else
> + BCTX_REFN(nvc0->bufctx_3d, 3D_SUF, res, RDWR);
> + } else {
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0);
> + PUSH_DATA(push, 0x14000);
> + PUSH_DATA(push, 0);
> + }
> +
> + /* stick surface information into the driver constant buffer */
> + if (s == 5)
> + BEGIN_NVC0(push, NVC0_CP(CB_SIZE), 3);
> + else
> + BEGIN_NVC0(push, NVC0_3D(CB_SIZE), 3);
> + PUSH_DATA (push, 2048);
> + PUSH_DATAh(push, screen->uniform_bo->offset + NVC0_CB_AUX_INFO(s));
> + PUSH_DATA (push, screen->uniform_bo->offset + NVC0_CB_AUX_INFO(s));
> + if (s == 5)
> + BEGIN_1IC0(push, NVC0_CP(CB_POS), 1 + 16);
> + else
> + BEGIN_1IC0(push, NVC0_3D(CB_POS), 1 + 16);
> + PUSH_DATA (push, NVC0_CB_AUX_SU_INFO(i));
> +
> + nvc0_set_surface_info(push, view, address, width, height, depth);
> + }
> +}
> +
> +static inline void
> nvc0_update_surface_bindings(struct nvc0_context *nvc0)
> {
> - /* TODO */
> + nvc0_validate_suf(nvc0, 4);
> +
> + /* Invalidate all COMPUTE images because they are aliased with FRAGMENT. */
> + nvc0->dirty_cp |= NVC0_NEW_CP_SURFACES;
> + nvc0->images_dirty[5] |= nvc0->images_valid[5];
> }
>
> static inline void
> --
> 2.8.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list