Apple GPUs support various non-linear image layouts. Add modifiers for these layouts. Mesa requires these modifiers to share non-linear buffers across processes, but no other userspace or kernel support is required/expected. These layouts are notably not used for interchange across hardware blocks (e.g. with the display controller). There are other layouts for that but we don't support them either in userspace or kernelspace yet (even downstream), so we don't add modifiers here. Signed-off-by: Alyssa Rosenzweig <alyssa@xxxxxxxxxxxxx> --- Changes in v2: - Rename "Twiddled" to "GPU-tiled" to match what I now believe is the canonical name. - Add modifiers for the actual "Twiddled" layouts. - Clarify that the body of compressed images are laid out like their uncompressed counterparts. - Link to v1: https://lore.kernel.org/r/20250218-apple-twiddled-modifiers-v1-1-8551bab4321f@xxxxxxxxxxxxx --- include/uapi/drm/drm_fourcc.h | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index e41a3cec6a9ed18760f3b0c88ba437c9aba3dd4f..8668c0275677bbc0a82a1028f122bacfb44a867b 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -422,6 +422,7 @@ extern "C" { #define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09 #define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a #define DRM_FORMAT_MOD_VENDOR_MTK 0x0b +#define DRM_FORMAT_MOD_VENDOR_APPLE 0x0c /* add more to the end as needed */ @@ -1494,6 +1495,63 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) /* alias for the most common tiling format */ #define DRM_FORMAT_MOD_MTK_16L_32S_TILE DRM_FORMAT_MOD_MTK(MTK_FMT_MOD_TILE_16L32S) +/* + * Apple GPU-tiled layout. + * + * GPU-tiled images are divided into tiles. Tiles are always 16KiB, with + * dimensions depending on the base-format. Within a tile, pixels are fully + * interleaved (Morton order). Tiles themselves are raster-order. + * + * Images must be 16-byte aligned. + * + * For more information see + * https://docs.mesa3d.org/drivers/asahi.html#image-layouts + * + * When lossless compression is impossible, this is the preferred layout. + */ +#define DRM_FORMAT_MOD_APPLE_GPU_TILED fourcc_mod_code(APPLE, 1) + +/* + * Apple compressed GPU-tiled layout. + * + * Compressed GPU-tiled images contain a body laid out like + * DRM_FORMAT_MOD_APPLE_GPU_TILED followed by a metadata section. + * + * The metadata section contains 8 bytes for each 16x16 compression subtile. The + * metadata section pads the image to power-of-two dimensions, and compression + * subtiles are interleaved (Morton order). By convention, the metadata + * immediately follows the body, after padding the body to 128-bytes. + * + * Images must be 16-byte aligned. + * + * This is the preferred layout. + */ +#define DRM_FORMAT_MOD_APPLE_GPU_TILED_COMPRESSED fourcc_mod_code(APPLE, 2) + +/* + * Apple twiddled layout. + * + * Twiddled images are padded to power-of-two dimensions, with pixels fully + * interleaved (Morton order). + * + * Images must be 16-byte aligned. + * + * GPU-tiling is preferred to twiddling. Twiddled images are mainly useful for + * sparse images, due to a limitation of the PBE unit. + */ +#define DRM_FORMAT_MOD_APPLE_TWIDDLED fourcc_mod_code(APPLE, 3) + +/* + * Apple compressed twiddled layout. + * + * Compressed twiddled images contain a body laid out like + * DRM_FORMAT_MOD_APPLE_TWIDDLED layout followed by metadata laid out like + * DRM_FORMAT_MOD_APPLE_GPU_TILED_COMPRESSED metadata. + * + * Images must be 16-byte aligned. + */ +#define DRM_FORMAT_MOD_APPLE_TWIDDLED_COMPRESSED fourcc_mod_code(APPLE, 4) + /* * AMD modifiers * --- base-commit: 0ed1356af8f629ae807963b7db4e501e3b580bc2 change-id: 20250218-apple-twiddled-modifiers-fde1a6f4300c Best regards, -- Alyssa Rosenzweig <alyssa@xxxxxxxxxxxxx>
