From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sat, 20 Aug 2022 17:13:36 +0000 (-0400)
Subject: asahi: Rename our fake twiddled DRM modifier
X-Git-Tag: upstream/22.3.5~3760
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f89e67883c9af2ccb4444120badfff4abba4cac;p=platform%2Fupstream%2Fmesa.git

asahi: Rename our fake twiddled DRM modifier

To account for non-64x64 tile sizes.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18167>
---

diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c
index cf5eca0..9f2d901 100644
--- a/src/gallium/drivers/asahi/agx_pipe.c
+++ b/src/gallium/drivers/asahi/agx_pipe.c
@@ -145,7 +145,7 @@ agx_select_modifier(const struct agx_resource *pres)
       return DRM_FORMAT_MOD_LINEAR;
 
    /* Default to tiled */
-   return DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER;
+   return DRM_FORMAT_MOD_APPLE_TWIDDLED;
 }
 
 static struct pipe_resource *
@@ -277,7 +277,7 @@ agx_transfer_map(struct pipe_context *pctx,
    pipe_resource_reference(&transfer->base.resource, resource);
    *out_transfer = &transfer->base;
 
-   if (rsrc->modifier == DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER) {
+   if (rsrc->modifier == DRM_FORMAT_MOD_APPLE_TWIDDLED) {
       transfer->base.stride =
          util_format_get_stride(resource->format, box->width);
 
@@ -332,7 +332,7 @@ agx_transfer_unmap(struct pipe_context *pctx,
 
    /* Tiling will occur in software from a staging cpu buffer */
    if ((transfer->usage & PIPE_MAP_WRITE) &&
-         rsrc->modifier == DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER) {
+         rsrc->modifier == DRM_FORMAT_MOD_APPLE_TWIDDLED) {
       assert(trans->map != NULL);
 
       for (unsigned z = 0; z < transfer->box.depth; ++z) {
@@ -659,7 +659,7 @@ agx_flush_frontbuffer(struct pipe_screen *_screen,
    void *map = winsys->displaytarget_map(winsys, rsrc->dt, PIPE_USAGE_DEFAULT);
    assert(map != NULL);
 
-   if (rsrc->modifier == DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER) {
+   if (rsrc->modifier == DRM_FORMAT_MOD_APPLE_TWIDDLED) {
       ail_detile(rsrc->bo->ptr.cpu, map, &rsrc->layout, 0, rsrc->dt_stride,
                  0, 0, rsrc->base.width0, rsrc->base.height0);
    } else {
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 753cf34..bded47a 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -408,7 +408,7 @@ static enum agx_layout
 agx_translate_layout(uint64_t modifier)
 {
    switch (modifier) {
-   case DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER:
+   case DRM_FORMAT_MOD_APPLE_TWIDDLED:
       return AGX_LAYOUT_TWIDDLED;
    case DRM_FORMAT_MOD_LINEAR:
       return AGX_LAYOUT_LINEAR;
@@ -486,7 +486,7 @@ agx_create_sampler_view(struct pipe_context *pctx,
       if (rsrc->modifier == DRM_FORMAT_MOD_LINEAR) {
          cfg.stride = ail_get_linear_stride_B(&rsrc->layout, level) - 16;
       } else {
-         assert(rsrc->modifier == DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER);
+         assert(rsrc->modifier == DRM_FORMAT_MOD_APPLE_TWIDDLED);
          cfg.stride = AGX_RT_STRIDE_TILED;
       }
    }
diff --git a/src/gallium/drivers/asahi/agx_state.h b/src/gallium/drivers/asahi/agx_state.h
index 791c95b..fc178bb 100644
--- a/src/gallium/drivers/asahi/agx_state.h
+++ b/src/gallium/drivers/asahi/agx_state.h
@@ -229,7 +229,7 @@ agx_device(struct pipe_screen *p)
 #ifndef DRM_FORMAT_MOD_LINEAR
 #define DRM_FORMAT_MOD_LINEAR 1
 #endif
-#define DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER (2)
+#define DRM_FORMAT_MOD_APPLE_TWIDDLED (2)
 
 struct agx_resource {
    struct pipe_resource	base;