Mesa (staging/20.0): iris: don't assert on unfinished aux import in copy paths
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 4 21:07:20 UTC 2020
Module: Mesa
Branch: staging/20.0
Commit: d1e566c705e18a6d019138330569d6ffebc1f489
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1e566c705e18a6d019138330569d6ffebc1f489
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Tue Apr 21 12:25:44 2020 +0300
iris: don't assert on unfinished aux import in copy paths
After a resource is created the first command using it could be a copy
command.
In iris_state we finish the import on surface/view creation but we
don't do that for copies.
v2: Move finish call to gallium entrypoints (Ken)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2725
Reviewed-by: Tapani Pälli <tapani.palli at intel.com> (v1)
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4657>
(cherry picked from commit 612e35c8d94241b07b32a6010ccd1a3edd473439)
---
.pick_status.json | 2 +-
src/gallium/drivers/iris/iris_blit.c | 36 +++++++++++++++++++++-----------
src/gallium/drivers/iris/iris_clear.c | 4 ++++
src/gallium/drivers/iris/iris_resource.c | 3 +++
4 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index f6b25381346..061035a0c80 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1534,7 +1534,7 @@
"description": "iris: don't assert on unfinished aux import in copy paths",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c
index ca45c1827da..4b43901d4b3 100644
--- a/src/gallium/drivers/iris/iris_blit.c
+++ b/src/gallium/drivers/iris/iris_blit.c
@@ -348,6 +348,11 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
blorp_flags |= BLORP_BATCH_PREDICATE_ENABLE;
}
+ if (iris_resource_unfinished_aux_import(src_res))
+ iris_resource_finish_aux_import(ctx->screen, src_res);
+ if (iris_resource_unfinished_aux_import(dst_res))
+ iris_resource_finish_aux_import(ctx->screen, dst_res);
+
struct iris_format_info src_fmt =
iris_format_for_usage(devinfo, info->src.format,
ISL_SURF_USAGE_TEXTURE_BIT);
@@ -718,44 +723,51 @@ get_preferred_batch(struct iris_context *ice, struct iris_bo *bo)
*/
static void
iris_resource_copy_region(struct pipe_context *ctx,
- struct pipe_resource *dst,
+ struct pipe_resource *p_dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
- struct pipe_resource *src,
+ struct pipe_resource *p_src,
unsigned src_level,
const struct pipe_box *src_box)
{
struct iris_context *ice = (void *) ctx;
struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
+ struct iris_resource *src = (void *) p_src;
+ struct iris_resource *dst = (void *) p_dst;
+
+ if (iris_resource_unfinished_aux_import(src))
+ iris_resource_finish_aux_import(ctx->screen, src);
+ if (iris_resource_unfinished_aux_import(dst))
+ iris_resource_finish_aux_import(ctx->screen, dst);
/* Use MI_COPY_MEM_MEM for tiny (<= 16 byte, % 4) buffer copies. */
- if (src->target == PIPE_BUFFER && dst->target == PIPE_BUFFER &&
+ if (p_src->target == PIPE_BUFFER && p_dst->target == PIPE_BUFFER &&
(src_box->width % 4 == 0) && src_box->width <= 16) {
- struct iris_bo *dst_bo = iris_resource_bo(dst);
+ struct iris_bo *dst_bo = iris_resource_bo(p_dst);
batch = get_preferred_batch(ice, dst_bo);
iris_batch_maybe_flush(batch, 24 + 5 * (src_box->width / 4));
iris_emit_pipe_control_flush(batch,
"stall for MI_COPY_MEM_MEM copy_region",
PIPE_CONTROL_CS_STALL);
- ice->vtbl.copy_mem_mem(batch, dst_bo, dstx, iris_resource_bo(src),
+ ice->vtbl.copy_mem_mem(batch, dst_bo, dstx, iris_resource_bo(p_src),
src_box->x, src_box->width);
return;
}
- iris_copy_region(&ice->blorp, batch, dst, dst_level, dstx, dsty, dstz,
- src, src_level, src_box);
+ iris_copy_region(&ice->blorp, batch, p_dst, dst_level, dstx, dsty, dstz,
+ p_src, src_level, src_box);
- if (util_format_is_depth_and_stencil(dst->format) &&
- util_format_has_stencil(util_format_description(src->format))) {
+ if (util_format_is_depth_and_stencil(p_dst->format) &&
+ util_format_has_stencil(util_format_description(p_src->format))) {
struct iris_resource *junk, *s_src_res, *s_dst_res;
- iris_get_depth_stencil_resources(src, &junk, &s_src_res);
- iris_get_depth_stencil_resources(dst, &junk, &s_dst_res);
+ iris_get_depth_stencil_resources(p_src, &junk, &s_src_res);
+ iris_get_depth_stencil_resources(p_dst, &junk, &s_dst_res);
iris_copy_region(&ice->blorp, batch, &s_dst_res->base, dst_level, dstx,
dsty, dstz, &s_src_res->base, src_level, src_box);
}
- iris_flush_and_dirty_for_history(ice, batch, (struct iris_resource *) dst,
+ iris_flush_and_dirty_for_history(ice, batch, dst,
PIPE_CONTROL_RENDER_TARGET_FLUSH,
"cache history: post copy_region");
}
diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c
index 3b4099df796..958a3d24781 100644
--- a/src/gallium/drivers/iris/iris_clear.c
+++ b/src/gallium/drivers/iris/iris_clear.c
@@ -697,8 +697,12 @@ iris_clear_texture(struct pipe_context *ctx,
{
struct iris_context *ice = (void *) ctx;
struct iris_screen *screen = (void *) ctx->screen;
+ struct iris_resource *res = (void *) p_res;
const struct gen_device_info *devinfo = &screen->devinfo;
+ if (iris_resource_unfinished_aux_import(res))
+ iris_resource_finish_aux_import(ctx->screen, res);
+
if (util_format_is_depth_or_stencil(p_res->format)) {
const struct util_format_description *fmt_desc =
util_format_description(p_res->format);
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index b752d4cf86b..ecc7f9e8872 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -1783,6 +1783,9 @@ iris_transfer_map(struct pipe_context *ctx,
struct iris_resource *res = (struct iris_resource *)resource;
struct isl_surf *surf = &res->surf;
+ if (iris_resource_unfinished_aux_import(res))
+ iris_resource_finish_aux_import(ctx->screen, res);
+
if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) {
/* Replace the backing storage with a fresh buffer for non-async maps */
if (!(usage & (PIPE_TRANSFER_UNSYNCHRONIZED |
More information about the mesa-commit
mailing list