commit d5a9cd1b7dd972e84f02396cbaa067ea59c2ff39
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Fri Jul 10 10:17:44 2020 -0400
committer Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Mon Jul 13 11:21:35 2020 -0400
tree badb94de0c5a2f1c7b2513b1015b3cdfbc6d443e
parent 64608b4bcf89ee84c37cd03290c4c276c6016b75

panfrost: Add format codes for new compressed textures

Compressed formats line up with CONFIG_TEX_COMPRESSED_FORMAT_ENABLE
documented on
https://releases.linaro.org/archive/14.07/android/images/armv8-android-juno-lsk/

None of the new formats have been seen in the wild.

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

src/panfrost/encoder/pan_format.c

diff --git a/src/panfrost/encoder/pan_format.c b/src/panfrost/encoder/pan_format.c
index 67c6fba..549b3be 100644
--- a/src/panfrost/encoder/pan_format.c
+++ b/src/panfrost/encoder/pan_format.c
@@ -51,35 +51,35 @@
         [PIPE_FORMAT_ETC2_RGB8A1] 		= { MALI_ETC2_RGB8A1, _T },
         [PIPE_FORMAT_ETC2_SRGB8A1] 		= { MALI_ETC2_RGB8A1, _T },
 
-        [PIPE_FORMAT_ASTC_4x4]	                = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_5x4]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_5x5]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_6x5]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_6x6]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x5]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x6]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x8]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x5]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x6]		        = { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x8]	        	= { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x10]		= { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_12x10]		= { MALI_ASTC_HDR_SUPP, _T },
-        [PIPE_FORMAT_ASTC_12x12]		= { MALI_ASTC_HDR_SUPP, _T },
+        [PIPE_FORMAT_ASTC_4x4]	                = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_5x4]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_5x5]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_6x5]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_6x6]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_8x5]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_8x6]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_8x8]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_10x5]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_10x6]		        = { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_10x8]	        	= { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_10x10]		= { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_12x10]		= { MALI_ASTC_2D_HDR, _T },
+        [PIPE_FORMAT_ASTC_12x12]		= { MALI_ASTC_2D_HDR, _T },
 
-        [PIPE_FORMAT_ASTC_4x4_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_5x4_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_5x5_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_6x5_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_6x6_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x5_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x6_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_8x8_SRGB]             = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x5_SRGB]            = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x6_SRGB]            = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x8_SRGB]            = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_10x10_SRGB]           = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_12x10_SRGB]           = { MALI_ASTC_SRGB_SUPP, _T },
-        [PIPE_FORMAT_ASTC_12x12_SRGB]           = { MALI_ASTC_SRGB_SUPP, _T },
+        [PIPE_FORMAT_ASTC_4x4_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_5x4_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_5x5_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_6x5_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_6x6_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_8x5_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_8x6_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_8x8_SRGB]             = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_10x5_SRGB]            = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_10x6_SRGB]            = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_10x8_SRGB]            = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_10x10_SRGB]           = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_12x10_SRGB]           = { MALI_ASTC_2D_LDR, _T },
+        [PIPE_FORMAT_ASTC_12x12_SRGB]           = { MALI_ASTC_2D_LDR, _T },
         [PIPE_FORMAT_B5G6R5_UNORM] 		= { MALI_RGB565, _VTR },
         [PIPE_FORMAT_B5G5R5X1_UNORM] 		= { MALI_RGB5_X1_UNORM, _VT },
         [PIPE_FORMAT_R5G5B5A1_UNORM] 		= { MALI_RGB5_A1_UNORM, _VTR },