diff --git a/.pick_status.json b/.pick_status.json
index e123a9ce373..5ae34e6d01b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1864,7 +1864,7 @@
         "description": "freedreno/fdl: Use 4k alignment for tiled",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c
index f55ea19d7ea..db45dfbac5e 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -85,19 +85,7 @@ fdl6_tile_alignment(struct fdl_layout *layout, uint32_t *heightalign)
       layout->pitchalign = 2;
    }
 
-   /* Empirical evidence suggests that images with UBWC could have much
-    * looser alignment requirements, however the validity of alignment is
-    * heavily undertested and the "officially" supported alignment is 4096b.
-    */
-   if (layout->ubwc || util_format_is_depth_or_stencil(layout->format) ||
-       fdl6_is_r8g8_layout(layout))
-      layout->base_align = 4096;
-   else if (layout->cpp == 1)
-      layout->base_align = 64;
-   else if (layout->cpp == 2)
-      layout->base_align = 128;
-   else
-      layout->base_align = 256;
+   layout->base_align = 4096;
 }
 
 /* NOTE: good way to test this is:  (for example)