Mesa (master): iris: Support planar resource imports for MC
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Sep 9 20:18:48 UTC 2020
Module: Mesa
Branch: master
Commit: 82720852bd6e33ca19c17fff845674f17127ba6a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82720852bd6e33ca19c17fff845674f17127ba6a
Author: Nanley Chery <nanley.g.chery at intel.com>
Date: Thu Jul 23 08:52:46 2020 -0700
iris: Support planar resource imports for MC
Support importing and mapping multiple planes of aux data for
I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6486>
---
src/gallium/drivers/iris/iris_resource.c | 85 +++++++++++++++++++++++---------
src/gallium/drivers/iris/iris_resource.h | 2 +-
2 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index bfd79603ee8..b8c54c768ea 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -419,7 +419,8 @@ iris_get_aux_clear_color_state_size(struct iris_screen *screen)
}
static void
-map_aux_addresses(struct iris_screen *screen, struct iris_resource *res)
+map_aux_addresses(struct iris_screen *screen, struct iris_resource *res,
+ enum isl_format format, unsigned plane)
{
const struct gen_device_info *devinfo = &screen->devinfo;
if (devinfo->gen >= 12 && isl_aux_usage_has_ccs(res->aux.usage)) {
@@ -427,8 +428,11 @@ map_aux_addresses(struct iris_screen *screen, struct iris_resource *res)
assert(aux_map_ctx);
const unsigned aux_offset = res->aux.extra_aux.surf.size_B > 0 ?
res->aux.extra_aux.offset : res->aux.offset;
- gen_aux_map_add_image(aux_map_ctx, &res->surf, res->bo->gtt_offset,
- res->aux.bo->gtt_offset + aux_offset);
+ const uint64_t format_bits =
+ gen_aux_map_format_bits(res->surf.tiling, format, plane);
+ gen_aux_map_add_mapping(aux_map_ctx, res->bo->gtt_offset + res->offset,
+ res->aux.bo->gtt_offset + aux_offset,
+ res->surf.size_B, format_bits);
res->bo->aux_map_address = res->aux.bo->gtt_offset;
}
}
@@ -741,6 +745,20 @@ iris_resource_init_aux_buf(struct iris_resource *res,
return true;
}
+static void
+import_aux_info(struct iris_resource *res,
+ const struct iris_resource *aux_res)
+{
+ assert(aux_res->aux.surf.row_pitch_B && aux_res->aux.offset);
+ assert(res->bo == aux_res->aux.bo);
+ assert(res->aux.surf.row_pitch_B == aux_res->aux.surf.row_pitch_B);
+ assert(res->bo->size >= aux_res->aux.offset + res->aux.surf.size_B);
+
+ iris_bo_reference(aux_res->aux.bo);
+ res->aux.bo = aux_res->aux.bo;
+ res->aux.offset = aux_res->aux.offset;
+}
+
void
iris_resource_finish_aux_import(struct pipe_screen *pscreen,
struct iris_resource *res)
@@ -749,21 +767,49 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
assert(iris_resource_unfinished_aux_import(res));
assert(!res->mod_info->supports_clear_color);
- struct iris_resource *aux_res = (void *) res->base.next;
- assert(aux_res->aux.surf.row_pitch_B && aux_res->aux.offset &&
- aux_res->aux.bo);
-
- assert(res->bo == aux_res->aux.bo);
- iris_bo_reference(aux_res->aux.bo);
- res->aux.bo = aux_res->aux.bo;
-
- res->aux.offset = aux_res->aux.offset;
+ /* Create an array of resources. Combining main and aux planes is easier
+ * with indexing as opposed to scanning the linked list.
+ */
+ struct iris_resource *r[4] = { NULL, };
+ unsigned num_planes = 0;
+ unsigned num_main_planes = 0;
+ for (struct pipe_resource *p_res = &res->base; p_res; p_res = p_res->next) {
+ r[num_planes] = (struct iris_resource *)p_res;
+ num_main_planes += r[num_planes++]->bo != NULL;
+ }
+
+ /* Get an ISL format to use with the aux-map. */
+ enum isl_format format;
+ switch (res->external_format) {
+ case PIPE_FORMAT_NV12: format = ISL_FORMAT_PLANAR_420_8; break;
+ case PIPE_FORMAT_P010: format = ISL_FORMAT_PLANAR_420_10; break;
+ case PIPE_FORMAT_P012: format = ISL_FORMAT_PLANAR_420_12; break;
+ case PIPE_FORMAT_P016: format = ISL_FORMAT_PLANAR_420_16; break;
+ case PIPE_FORMAT_YUYV: format = ISL_FORMAT_YCRCB_NORMAL; break;
+ case PIPE_FORMAT_UYVY: format = ISL_FORMAT_YCRCB_SWAPY; break;
+ default: format = res->surf.format; break;
+ }
+
+ /* Combine main and aux plane information. */
+ if (num_main_planes == 1 && num_planes == 2) {
+ import_aux_info(r[0], r[1]);
+ map_aux_addresses(screen, r[0], format, 0);
+ } else if (num_main_planes == 2 && num_planes == 4) {
+ import_aux_info(r[0], r[2]);
+ import_aux_info(r[1], r[3]);
+ map_aux_addresses(screen, r[0], format, 0);
+ map_aux_addresses(screen, r[1], format, 1);
+ } else {
+ /* Gallium has lowered a single main plane into two. */
+ assert(num_main_planes == 2 && num_planes == 3);
+ assert(isl_format_is_yuv(format) && !isl_format_is_planar(format));
+ import_aux_info(r[0], r[2]);
+ import_aux_info(r[1], r[2]);
+ map_aux_addresses(screen, r[0], format, 0);
+ }
- assert(res->bo->size >= (res->aux.offset + res->aux.surf.size_B));
+ /* Add on a clear color BO. */
assert(res->aux.clear_color_bo == NULL);
-
- assert(aux_res->aux.surf.row_pitch_B == res->aux.surf.row_pitch_B);
-
unsigned clear_color_state_size =
iris_get_aux_clear_color_state_size(screen);
@@ -773,11 +819,6 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
clear_color_state_size, 1, IRIS_MEMZONE_OTHER,
I915_TILING_NONE, 0, BO_ALLOC_ZEROED);
}
-
- iris_resource_destroy(&screen->base, res->base.next);
- res->base.next = NULL;
-
- map_aux_addresses(screen, res);
}
static struct pipe_resource *
@@ -907,7 +948,7 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen,
iris_get_aux_clear_color_state_size(screen);
if (!iris_resource_init_aux_buf(res, clear_color_state_size))
goto fail;
- map_aux_addresses(screen, res);
+ map_aux_addresses(screen, res, res->surf.format, 0);
}
if (templ->bind & PIPE_BIND_SHARED)
diff --git a/src/gallium/drivers/iris/iris_resource.h b/src/gallium/drivers/iris/iris_resource.h
index e98d2ac69d1..7c14a6eef99 100644
--- a/src/gallium/drivers/iris/iris_resource.h
+++ b/src/gallium/drivers/iris/iris_resource.h
@@ -470,7 +470,7 @@ enum isl_format iris_image_view_get_format(struct iris_context *ice,
static inline bool
iris_resource_unfinished_aux_import(struct iris_resource *res)
{
- return res->base.next != NULL && res->mod_info &&
+ return res->aux.bo == NULL && res->mod_info &&
res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
}
More information about the mesa-commit
mailing list