crocus: Delete modifier with aux code

Modifiers with compression are not supported.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24120>

diff --git a/src/gallium/drivers/crocus/crocus_blit.c b/src/gallium/drivers/crocus/crocus_blit.c
index 321ba58..4a85992 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_blit.c
+++ b/src/gallium/drivers/crocus/crocus_blit.c
@@ -278,8 +278,6 @@ crocus_blorp_surf_for_resource(struct crocus_vtable *vtbl,
 {
    struct crocus_resource *res = (void *) p_res;
 
-   assert(!crocus_resource_unfinished_aux_import(res));
-
    if (isl_aux_usage_has_hiz(aux_usage) &&
        !crocus_resource_level_has_hiz(res, level))
       aux_usage = ISL_AUX_USAGE_NONE;
@@ -553,11 +551,6 @@ use_blorp:
       enum pipe_format dst_pfmt =
          pipe_format_for_aspect(info->dst.format, aspect);
 
-      if (crocus_resource_unfinished_aux_import(src_res))
-         crocus_resource_finish_aux_import(ctx->screen, src_res);
-      if (crocus_resource_unfinished_aux_import(dst_res))
-         crocus_resource_finish_aux_import(ctx->screen, dst_res);
-
       struct crocus_format_info src_fmt =
          crocus_format_for_usage(devinfo, src_pfmt, ISL_SURF_USAGE_TEXTURE_BIT);
       enum isl_aux_usage src_aux_usage =
@@ -776,14 +769,8 @@ crocus_resource_copy_region(struct pipe_context *ctx,
    struct crocus_batch *batch = &ice->batches[CROCUS_BATCH_RENDER];
    struct crocus_screen *screen = (struct crocus_screen *)ctx->screen;
    const struct intel_device_info *devinfo = &screen->devinfo;
-   struct crocus_resource *src = (void *) p_src;
    struct crocus_resource *dst = (void *) p_dst;
 
-   if (crocus_resource_unfinished_aux_import(src))
-      crocus_resource_finish_aux_import(ctx->screen, src);
-   if (crocus_resource_unfinished_aux_import(dst))
-      crocus_resource_finish_aux_import(ctx->screen, dst);
-
    if (devinfo->ver < 6 && util_format_is_depth_or_stencil(p_dst->format)) {
       util_resource_copy_region(ctx, p_dst, dst_level, dstx, dsty, dstz,
                                 p_src, src_level, src_box);

diff --git a/src/gallium/drivers/crocus/crocus_clear.c b/src/gallium/drivers/crocus/crocus_clear.c
index 6de7025..171b145 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_clear.c
+++ b/src/gallium/drivers/crocus/crocus_clear.c
@@ -702,16 +702,12 @@ crocus_clear_texture(struct pipe_context *ctx,
    struct crocus_context *ice = (void *) ctx;
    struct crocus_screen *screen = (void *) ctx->screen;
    const struct intel_device_info *devinfo = &screen->devinfo;
-   struct crocus_resource *res = (void *) p_res;
 
    if (devinfo->ver < 6) {
       u_default_clear_texture(ctx, p_res, level, box, data);
       return;
    }
 
-   if (crocus_resource_unfinished_aux_import(res))
-      crocus_resource_finish_aux_import(ctx->screen, res);
-
    if (util_format_is_depth_or_stencil(p_res->format)) {
       const struct util_format_unpack_description *fmt_unpack =
          util_format_unpack_description(p_res->format);

diff --git a/src/gallium/drivers/crocus/crocus_resource.c b/src/gallium/drivers/crocus/crocus_resource.c
index 789a04d..cecf771 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_resource.c
+++ b/src/gallium/drivers/crocus/crocus_resource.c
@@ -66,7 +66,6 @@ static const uint64_t priority_to_modifier[] = {
    [MODIFIER_PRIORITY_LINEAR] = DRM_FORMAT_MOD_LINEAR,
    [MODIFIER_PRIORITY_X] = I915_FORMAT_MOD_X_TILED,
    [MODIFIER_PRIORITY_Y] = I915_FORMAT_MOD_Y_TILED,
-   [MODIFIER_PRIORITY_Y_CCS] = I915_FORMAT_MOD_Y_TILED_CCS,
 };
 
 static bool
@@ -76,8 +75,6 @@ modifier_is_supported(const struct intel_device_info *devinfo,
 {
    /* XXX: do something real */
    switch (modifier) {
-   case I915_FORMAT_MOD_Y_TILED_CCS:
-      return false;
    case I915_FORMAT_MOD_Y_TILED:
       if (bind & PIPE_BIND_SCANOUT)
          return false;
@@ -105,9 +102,6 @@ select_best_modifier(struct intel_device_info *devinfo,
          continue;
 
       switch (modifiers[i]) {
-      case I915_FORMAT_MOD_Y_TILED_CCS:
-         prio = MAX2(prio, MODIFIER_PRIORITY_Y_CCS);
-         break;
       case I915_FORMAT_MOD_Y_TILED:
          prio = MAX2(prio, MODIFIER_PRIORITY_Y);
          break;
@@ -280,7 +274,6 @@ crocus_query_dmabuf_modifiers(struct pipe_screen *pscreen,
       DRM_FORMAT_MOD_LINEAR,
       I915_FORMAT_MOD_X_TILED,
       I915_FORMAT_MOD_Y_TILED,
-      I915_FORMAT_MOD_Y_TILED_CCS,
    };
 
    int supported_mods = 0;
@@ -425,16 +418,15 @@ create_aux_state_map(struct crocus_resource *res, enum isl_aux_state initial)
  */
 static bool
 crocus_resource_configure_aux(struct crocus_screen *screen,
-                              struct crocus_resource *res, bool imported,
+                              struct crocus_resource *res,
                               uint64_t *aux_size_B,
                               uint32_t *alloc_flags)
 {
    const struct intel_device_info *devinfo = &screen->devinfo;
 
-   /* Try to create the auxiliary surfaces allowed by the modifier or by
-    * the user if no modifier is specified.
-    */
-   assert(!res->mod_info || res->mod_info->aux_usage == ISL_AUX_USAGE_NONE);
+   /* Modifiers with compression are not supported. */
+   assert(!res->mod_info ||
+          !isl_drm_modifier_has_aux(res->mod_info->modifier));
 
    const bool has_mcs = devinfo->ver >= 7 && !res->mod_info &&
       isl_surf_get_mcs_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
@@ -444,17 +436,14 @@ crocus_resource_configure_aux(struct crocus_screen *screen,
       isl_surf_get_hiz_surf(&screen->isl_dev, &res->surf, &res->aux.surf);
 
    const bool has_ccs =
-      ((devinfo->ver >= 7 && !res->mod_info && !INTEL_DEBUG(DEBUG_NO_CCS)) ||
-       (res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE)) &&
+      devinfo->ver >= 7 && !res->mod_info && !INTEL_DEBUG(DEBUG_NO_CCS) &&
       isl_surf_get_ccs_surf(&screen->isl_dev, &res->surf, NULL,
                             &res->aux.surf, 0);
 
    /* Having more than one type of compression is impossible */
    assert(has_ccs + has_mcs + has_hiz <= 1);
 
-   if (res->mod_info && has_ccs) {
-      res->aux.usage = res->mod_info->aux_usage;
-   } else if (has_mcs) {
+   if (has_mcs) {
       res->aux.usage = ISL_AUX_USAGE_MCS;
    } else if (has_hiz) {
       res->aux.usage = ISL_AUX_USAGE_HIZ;
@@ -470,9 +459,8 @@ crocus_resource_configure_aux(struct crocus_screen *screen,
 
    switch (res->aux.usage) {
    case ISL_AUX_USAGE_NONE:
-      /* Having no aux buffer is only okay if there's no modifier with aux. */
       res->aux.surf.levels = 0;
-      return !res->mod_info || res->mod_info->aux_usage == ISL_AUX_USAGE_NONE;
+      return true;
    case ISL_AUX_USAGE_HIZ:
       initial_state = ISL_AUX_STATE_AUX_INVALID;
       break;
@@ -502,11 +490,7 @@ crocus_resource_configure_aux(struct crocus_screen *screen,
        * For CCS_D, do the same thing.  On Gen9+, this avoids having any
        * undefined bits in the aux buffer.
        */
-      if (imported)
-         initial_state =
-            isl_drm_modifier_get_default_aux_state(res->mod_info->modifier);
-      else
-         initial_state = ISL_AUX_STATE_PASS_THROUGH;
+      initial_state = ISL_AUX_STATE_PASS_THROUGH;
       *alloc_flags |= BO_ALLOC_ZEROED;
       break;
    default:
@@ -519,9 +503,7 @@ crocus_resource_configure_aux(struct crocus_screen *screen,
       return false;
 
    /* Increase the aux offset if the main and aux surfaces will share a BO. */
-   res->aux.offset =
-      !res->mod_info || res->mod_info->aux_usage == res->aux.usage ?
-      ALIGN(res->surf.size_B, res->aux.surf.alignment_B) : 0;
+   res->aux.offset = ALIGN(res->surf.size_B, res->aux.surf.alignment_B);
    uint64_t size = res->aux.surf.size_B;
 
    /* Allocate space in the buffer for storing the clear color. On modern
@@ -592,7 +574,7 @@ crocus_resource_alloc_separate_aux(struct crocus_screen *screen,
 {
    uint32_t alloc_flags;
    uint64_t size;
-   if (!crocus_resource_configure_aux(screen, res, false, &size, &alloc_flags))
+   if (!crocus_resource_configure_aux(screen, res, &size, &alloc_flags))
       return false;
 
    if (size == 0)
@@ -616,31 +598,6 @@ crocus_resource_alloc_separate_aux(struct crocus_screen *screen,
    return true;
 }
 
-void
-crocus_resource_finish_aux_import(struct pipe_screen *pscreen,
-                                  struct crocus_resource *res)
-{
-   struct crocus_screen *screen = (struct crocus_screen *)pscreen;
-   assert(crocus_resource_unfinished_aux_import(res));
-   assert(!res->mod_info->supports_clear_color);
-
-   struct crocus_resource *aux_res = (void *) res->base.b.next;
-   assert(aux_res->aux.surf.row_pitch_B && aux_res->aux.offset &&
-          aux_res->aux.bo);
-
-   assert(res->bo == aux_res->aux.bo);
-   crocus_bo_reference(aux_res->aux.bo);
-   res->aux.bo = aux_res->aux.bo;
-
-   res->aux.offset = aux_res->aux.offset;
-
-   assert(res->bo->size >= (res->aux.offset + res->aux.surf.size_B));
-   assert(aux_res->aux.surf.row_pitch_B == res->aux.surf.row_pitch_B);
-
-   crocus_resource_destroy(&screen->base, res->base.b.next);
-   res->base.b.next = NULL;
-}
-
 static struct pipe_resource *
 crocus_resource_create_for_buffer(struct pipe_screen *pscreen,
                                   const struct pipe_resource *templ)
@@ -712,7 +669,7 @@ crocus_resource_create_with_modifiers(struct pipe_screen *pscreen,
    uint64_t aux_size = 0;
    uint32_t aux_preferred_alloc_flags;
 
-   if (!crocus_resource_configure_aux(screen, res, false, &aux_size,
+   if (!crocus_resource_configure_aux(screen, res, &aux_size,
                                       &aux_preferred_alloc_flags)) {
       goto fail;
    }
@@ -847,46 +804,24 @@ crocus_resource_from_handle(struct pipe_screen *pscreen,
    res->offset = whandle->offset;
    res->external_format = whandle->format;
 
-   if (whandle->plane < util_format_get_num_planes(whandle->format)) {
-      const uint64_t modifier =
-         whandle->modifier != DRM_FORMAT_MOD_INVALID ?
-         whandle->modifier : tiling_to_modifier(res->bo->tiling_mode);
-
-      UNUSED const bool isl_surf_created_successfully =
-         crocus_resource_configure_main(screen, res, templ, modifier,
-                                        whandle->stride);
-      assert(isl_surf_created_successfully);
-      assert(res->bo->tiling_mode ==
-             isl_tiling_to_i915_tiling(res->surf.tiling));
-
-      // XXX: create_ccs_buf_for_image?
-      if (whandle->modifier == DRM_FORMAT_MOD_INVALID) {
-         if (!crocus_resource_alloc_separate_aux(screen, res))
-            goto fail;
-      } else {
-         if (res->mod_info->aux_usage != ISL_AUX_USAGE_NONE) {
-            uint32_t alloc_flags;
-            uint64_t size;
-            UNUSED bool ok = crocus_resource_configure_aux(screen, res, true, &size,
-                                                           &alloc_flags);
-            assert(ok);
-            /* The gallium dri layer will create a separate plane resource
-             * for the aux image. crocus_resource_finish_aux_import will
-             * merge the separate aux parameters back into a single
-             * crocus_resource.
-             */
-         }
-      }
+   assert(whandle->plane < util_format_get_num_planes(whandle->format));
+   const uint64_t modifier =
+      whandle->modifier != DRM_FORMAT_MOD_INVALID ?
+      whandle->modifier : tiling_to_modifier(res->bo->tiling_mode);
+
+   UNUSED const bool isl_surf_created_successfully =
+      crocus_resource_configure_main(screen, res, templ, modifier,
+                                     whandle->stride);
+   assert(isl_surf_created_successfully);
+   assert(res->bo->tiling_mode ==
+          isl_tiling_to_i915_tiling(res->surf.tiling));
+
+   // XXX: create_ccs_buf_for_image?
+   if (whandle->modifier == DRM_FORMAT_MOD_INVALID) {
+      if (!crocus_resource_alloc_separate_aux(screen, res))
+         goto fail;
    } else {
-      /* Save modifier import information to reconstruct later. After
-       * import, this will be available under a second image accessible
-       * from the main image with res->base.next. See
-       * crocus_resource_finish_aux_import.
-       */
-      res->aux.surf.row_pitch_B = whandle->stride;
-      res->aux.offset = whandle->offset;
-      res->aux.bo = res->bo;
-      res->bo = NULL;
+      assert(!isl_drm_modifier_has_aux(whandle->modifier));
    }
 
    return &res->base.b;
@@ -933,13 +868,15 @@ crocus_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
 {
    struct crocus_context *ice = (struct crocus_context *)ctx;
    struct crocus_resource *res = (void *) resource;
-   const struct isl_drm_modifier_info *mod = res->mod_info;
+
+   /* Modifiers with compression are not supported. */
+   assert(!res->mod_info ||
+          !isl_drm_modifier_has_aux(res->mod_info->modifier));
 
    crocus_resource_prepare_access(ice, res,
                                   0, INTEL_REMAINING_LEVELS,
                                   0, INTEL_REMAINING_LAYERS,
-                                  mod ? mod->aux_usage : ISL_AUX_USAGE_NONE,
-                                  mod ? mod->supports_clear_color : false);
+                                  ISL_AUX_USAGE_NONE, false);
 }
 
 static void
@@ -947,15 +884,15 @@ crocus_resource_disable_aux_on_first_query(struct pipe_resource *resource,
                                            unsigned usage)
 {
    struct crocus_resource *res = (struct crocus_resource *)resource;
-   bool mod_with_aux =
-      res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
+
+   /* Modifiers with compression are not supported. */
+   assert(!res->mod_info ||
+          !isl_drm_modifier_has_aux(res->mod_info->modifier));
 
    /* Disable aux usage if explicit flush not set and this is the first time
-    * we are dealing with this resource and the resource was not created with
-    * a modifier with aux.
+    * we are dealing with this resource.
     */
-   if (!mod_with_aux &&
-       (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) && res->aux.usage != 0) &&
+   if ((!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) && res->aux.usage != 0) &&
        p_atomic_read(&resource->reference.count) == 1) {
       crocus_resource_disable_aux(res);
    }
@@ -974,35 +911,31 @@ crocus_resource_get_param(struct pipe_screen *pscreen,
 {
    struct crocus_screen *screen = (struct crocus_screen *)pscreen;
    struct crocus_resource *res = (struct crocus_resource *)resource;
-   bool mod_with_aux =
-      res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
-   bool wants_aux = mod_with_aux && plane > 0;
+
+   /* Modifiers with compression are not supported. */
+   assert(!res->mod_info ||
+          !isl_drm_modifier_has_aux(res->mod_info->modifier));
+
    bool result;
    unsigned handle;
 
-   if (crocus_resource_unfinished_aux_import(res))
-      crocus_resource_finish_aux_import(pscreen, res);
-
-   struct crocus_bo *bo = wants_aux ? res->aux.bo : res->bo;
+   struct crocus_bo *bo = res->bo;
 
    crocus_resource_disable_aux_on_first_query(resource, handle_usage);
 
    switch (param) {
-   case PIPE_RESOURCE_PARAM_NPLANES:
-      if (mod_with_aux) {
-         *value = util_format_get_num_planes(res->external_format);
-      } else {
-         unsigned count = 0;
-         for (struct pipe_resource *cur = resource; cur; cur = cur->next)
-            count++;
-         *value = count;
-      }
+   case PIPE_RESOURCE_PARAM_NPLANES: {
+      unsigned count = 0;
+      for (struct pipe_resource *cur = resource; cur; cur = cur->next)
+         count++;
+      *value = count;
       return true;
+      }
    case PIPE_RESOURCE_PARAM_STRIDE:
-      *value = wants_aux ? res->aux.surf.row_pitch_B : res->surf.row_pitch_B;
+      *value = res->surf.row_pitch_B;
       return true;
    case PIPE_RESOURCE_PARAM_OFFSET:
-      *value = wants_aux ? res->aux.offset : 0;
+      *value = 0;
       return true;
    case PIPE_RESOURCE_PARAM_MODIFIER:
       *value = res->mod_info ? res->mod_info->modifier :
@@ -1044,30 +977,24 @@ crocus_resource_get_handle(struct pipe_screen *pscreen,
 {
    struct crocus_screen *screen = (struct crocus_screen *) pscreen;
    struct crocus_resource *res = (struct crocus_resource *)resource;
-   bool mod_with_aux =
-      res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
+
+   /* Modifiers with compression are not supported. */
+   assert(!res->mod_info ||
+          !isl_drm_modifier_has_aux(res->mod_info->modifier));
 
    crocus_resource_disable_aux_on_first_query(resource, usage);
 
    struct crocus_bo *bo;
-   if (mod_with_aux && whandle->plane > 0) {
-      assert(res->aux.bo);
-      bo = res->aux.bo;
-      whandle->stride = res->aux.surf.row_pitch_B;
-      whandle->offset = res->aux.offset;
-   } else {
-      /* If this is a buffer, stride should be 0 - no need to special case */
-      whandle->stride = res->surf.row_pitch_B;
-      bo = res->bo;
-   }
+   /* If this is a buffer, stride should be 0 - no need to special case */
+   whandle->stride = res->surf.row_pitch_B;
+   bo = res->bo;
    whandle->format = res->external_format;
    whandle->modifier =
       res->mod_info ? res->mod_info->modifier
                     : tiling_to_modifier(res->bo->tiling_mode);
 
 #ifndef NDEBUG
-   enum isl_aux_usage allowed_usage =
-      res->mod_info ? res->mod_info->aux_usage : ISL_AUX_USAGE_NONE;
+   enum isl_aux_usage allowed_usage = ISL_AUX_USAGE_NONE;
 
    if (res->aux.usage != allowed_usage) {
       enum isl_aux_state aux_state = crocus_resource_get_aux_state(res, 0, 0);

diff --git a/src/gallium/drivers/crocus/crocus_resource.h b/src/gallium/drivers/crocus/crocus_resource.h
index 61b42a8..34f496c 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_resource.h
+++ b/src/gallium/drivers/crocus/crocus_resource.h
@@ -503,16 +503,6 @@ void crocus_resource_prepare_texture(struct crocus_context *ice,
                                      uint32_t start_level, uint32_t num_levels,
                                      uint32_t start_layer, uint32_t num_layers);
 
-static inline bool
-crocus_resource_unfinished_aux_import(struct crocus_resource *res)
-{
-   return res->base.b.next != NULL && res->mod_info &&
-      res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
-}
-
-void crocus_resource_finish_aux_import(struct pipe_screen *pscreen,
-                                       struct crocus_resource *res);
-
 bool crocus_has_invalid_primary(const struct crocus_resource *res,
                                 unsigned start_level, unsigned num_levels,
                                 unsigned start_layer, unsigned num_layers);

diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index 7daf7c7..90f114d 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -2800,12 +2800,6 @@ crocus_create_sampler_view(struct pipe_context *ctx,
    }
 #endif
 #endif
-   /* Fill out SURFACE_STATE for this view. */
-   if (tmpl->target != PIPE_BUFFER) {
-      if (crocus_resource_unfinished_aux_import(isv->res))
-         crocus_resource_finish_aux_import(&screen->base, isv->res);
-
-   }
 
    return &isv->base;
 }
@@ -2904,9 +2898,6 @@ crocus_create_surface(struct pipe_context *ctx,
       return psurf;
 
    if (!isl_format_is_compressed(res->surf.format)) {
-      if (crocus_resource_unfinished_aux_import(res))
-         crocus_resource_finish_aux_import(&screen->base, res);
-
       memcpy(&surf->surf, &res->surf, sizeof(surf->surf));
       uint64_t temp_offset;
       uint32_t temp_x, temp_y;