panfrost: Revert "Require 64-byte alignment on imports"

This reverts commit 811f8a1946. As Alpine put it
-- this is causing more problems than it's fixing. Hotfix to revert the
offending commit until a more measured fix can be implemented.

Closes: #7731
Cc: mesa-stable
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reported-by: Jan Palus
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19993>
(cherry picked from commit 4b19725ee5)

.pick_status.json

@@ -931,7 +931,7 @@
         "description": "panfrost: Revert \"Require 64-byte alignment on imports\"",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },

src/panfrost/lib/pan_layout.c

@@ -275,34 +275,6 @@ panfrost_texture_offset(const struct pan_image_layout *layout,
                (surface_idx * layout->slices[level].surface_stride);
 }
 
-/*
- * Return the minimum stride alignment in bytes for a given texture format.
- *
- * There is no format on any supported Mali with a minimum alignment greater
- * than 64 bytes, but 64 bytes is the required alignment of all regular formats
- * in v7 and newer. If this alignment is not met, imprecise faults may be
- * raised.
- *
- * This may not be necessary on older hardware but we enforce it there too for
- * uniformity. If this poses a problem there, we'll need a solution that can
- * handle v7 as well.
- *
- * Certain non-regular formats require smaller power-of-two alignments.
- * This requirement could be loosened in the future if there is a compelling
- * reason, by making this query more precise.
- */
-uint32_t
-pan_stride_align_B(UNUSED enum pipe_format format)
-{
-        return 64;
-}
-
-bool
-pan_is_stride_aligned(enum pipe_format format, uint32_t stride_B)
-{
-        return (stride_B % pan_stride_align_B(format)) == 0;
-}
-
 bool
 pan_image_layout_init(struct pan_image_layout *layout,
                       const struct pan_image_explicit_layout *explicit_layout)
@@ -316,15 +288,8 @@ pan_image_layout_init(struct pan_image_layout *layout,
              layout->nr_slices > 1 || layout->crc_mode == PAN_IMAGE_CRC_INBAND))
                 return false;
 
-        /* Require both offsets and strides to be aligned to the hardware
-         * requirement. Panfrost allocates offsets and strides like this, so
-         * this requirement is satisfied by any image that was exported from
-         * another process with Panfrost. However, it does restrict imports of
-         * EGL external images.
-         */
-        if (explicit_layout &&
-            !(pan_is_stride_aligned(layout->format, explicit_layout->offset) &&
-              pan_is_stride_aligned(layout->format, explicit_layout->row_stride)))
+        /* Mandate 64 byte alignement */
+        if (explicit_layout && (explicit_layout->offset & 63))
                 return false;
 
         unsigned fmt_blocksize = util_format_get_blocksize(layout->format);
@@ -378,19 +343,10 @@ pan_image_layout_init(struct pan_image_layout *layout,
 
                         row_stride = explicit_layout->row_stride;
                 } else if (linear) {
-                        /* Keep lines alignment on 64 byte for performance.
-                         *
-                         * Note that this is a multiple of the minimum
-                         * stride alignment, so the hardware requirement is
-                         * satisfied as a result.
-                         */
+                        /* Keep lines alignment on 64 byte for performance */
                         row_stride = ALIGN_POT(row_stride, 64);
                 }
 
-
-                assert(pan_is_stride_aligned(layout->format, row_stride) &&
-                       "alignment gauranteed in both code paths");
-
                 unsigned slice_one_size = row_stride * (effective_height / block_size.height);
 
                 /* Compute AFBC sizes if necessary */
@@ -430,10 +386,6 @@ pan_image_layout_init(struct pan_image_layout *layout,
 
                 slice->surface_stride = slice_one_size;
 
-                assert(pan_is_stride_aligned(layout->format, slice->surface_stride) &&
-                       "integer multiple of aligned is still aligned, "
-                       "and AFBC header is at least 64 byte aligned");
-
                 /* Compute AFBC sizes if necessary */
 
                 offset += slice_full_size;

src/panfrost/lib/pan_texture.c

@@ -247,18 +247,10 @@ panfrost_get_surface_strides(const struct pan_image_layout *layout,
                  * repurposed as a Y offset which we don't use */
                 *row_stride = PAN_ARCH < 7 ? 0 : slice->row_stride;
                 *surf_stride = slice->afbc.surface_stride;
-
-                /* Row stride alignment requirement does not apply to AFBC */
         } else {
                 *row_stride = slice->row_stride;
                 *surf_stride = slice->surface_stride;
-
-                /* Particular for linear, the row stride must be aligned */
-                assert(pan_is_stride_aligned(layout->format, *row_stride));
         }
-
-        /* All surface strides are aligned, required for linear */
-        assert(pan_is_stride_aligned(layout->format, *surf_stride));
 }
 
 static mali_ptr

src/panfrost/lib/pan_texture.h

@@ -248,12 +248,6 @@ panfrost_from_legacy_stride(unsigned legacy_stride,
                             enum pipe_format format,
                             uint64_t modifier);
 
-uint32_t
-pan_stride_align_B(enum pipe_format format);
-
-bool
-pan_is_stride_aligned(enum pipe_format format, unsigned stride_B);
-
 struct pan_surface {
         union {
                 mali_ptr data;