From 76096c723ae719bd3032dc27844f26f3bf5166c8 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 3 Sep 2020 17:26:49 +0200 Subject: [PATCH] panfrost: Clarify what TILED mode is We have 2 tile modes: tiled linear and tiled U-interleaved. Let's rename the existing value to clarify that. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_mfbd.c | 4 ++-- src/gallium/drivers/panfrost/pan_sfbd.c | 2 +- src/panfrost/lib/midgard.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c index fad3f02..65a4894 100644 --- a/src/gallium/drivers/panfrost/pan_mfbd.c +++ b/src/gallium/drivers/panfrost/pan_mfbd.c @@ -243,7 +243,7 @@ panfrost_mfbd_set_cbuf( if (is_bifrost) { rt->format.unk3 |= 0x8; } else { - rt->format.block = MALI_BLOCK_FORMAT_TILED; + rt->format.block = MALI_BLOCK_FORMAT_TILED_U_INTERLEAVED; } rt->framebuffer = base; @@ -336,7 +336,7 @@ panfrost_mfbd_set_zsbuf( fbx->flags_hi |= 0x440; fbx->flags_lo |= 0x1; } else { - fbx->zs_block = MALI_BLOCK_FORMAT_TILED; + fbx->zs_block = MALI_BLOCK_FORMAT_TILED_U_INTERLEAVED; } fbx->ds_linear.depth_stride = stride; diff --git a/src/gallium/drivers/panfrost/pan_sfbd.c b/src/gallium/drivers/panfrost/pan_sfbd.c index ce68740..e03199e 100644 --- a/src/gallium/drivers/panfrost/pan_sfbd.c +++ b/src/gallium/drivers/panfrost/pan_sfbd.c @@ -144,7 +144,7 @@ panfrost_sfbd_set_cbuf( if (rsrc->modifier == DRM_FORMAT_MOD_LINEAR) fb->format.block = MALI_BLOCK_FORMAT_LINEAR; else if (rsrc->modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED) { - fb->format.block = MALI_BLOCK_FORMAT_TILED; + fb->format.block = MALI_BLOCK_FORMAT_TILED_U_INTERLEAVED; fb->stride *= 16; } else { fprintf(stderr, "Invalid render modifier\n"); diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml index e27f880..45f9d28 100644 --- a/src/panfrost/lib/midgard.xml +++ b/src/panfrost/lib/midgard.xml @@ -180,7 +180,7 @@ - + -- 2.7.4