panfrost: Correctly identify format 0x4c

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4292>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4292>

diff --git a/src/panfrost/encoder/pan_format.c b/src/panfrost/encoder/pan_format.c
index 89f4695deaa14f8a28758e80f129d6f3c799c823..873c4d227d2f43df2fc695a4985b3601fe92a7a9 100644 (file)
--- a/src/panfrost/encoder/pan_format.c
+++ b/src/panfrost/encoder/pan_format.c
@@ -91,9 +91,6 @@ panfrost_find_format(const struct util_format_description *desc)
         /* Check for special formats */
         switch (desc->format)
         {
-        case PIPE_FORMAT_NV12:
-                return MALI_NV12;
-
         case PIPE_FORMAT_R10G10B10X2_UNORM:
         case PIPE_FORMAT_B10G10R10X2_UNORM:
         case PIPE_FORMAT_R10G10B10A2_UNORM:

diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index a409f15147e830b3500b13ef55c686facda9eee4..118d8beb96f91650a8578da6dacac2e8ab658783 100644 (file)
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -295,11 +295,9 @@ enum mali_format {
        MALI_RGB10_A2I      = MALI_FORMAT_SPECIAL | 0x9,
 
        MALI_RGB332_UNORM   = MALI_FORMAT_SPECIAL | 0xb,
+       MALI_RGB233_UNORM   = MALI_FORMAT_SPECIAL | 0xc,
 
-       /* YUV formats */
-       MALI_NV12           = MALI_FORMAT_SPECIAL | 0xc,
-
-       MALI_Z32_UNORM      = MALI_FORMAT_SPECIAL | 0xD,
+       MALI_Z32_UNORM      = MALI_FORMAT_SPECIAL | 0xd,
        MALI_R32_FIXED      = MALI_FORMAT_SPECIAL | 0x11,
        MALI_RG32_FIXED     = MALI_FORMAT_SPECIAL | 0x12,
        MALI_RGB32_FIXED    = MALI_FORMAT_SPECIAL | 0x13,

diff --git a/src/panfrost/pandecode/pan_pretty_print.c b/src/panfrost/pandecode/pan_pretty_print.c
index 96ef7d7b2c33df1ed2f397a90d53aafb8c09be7d..a1a87fa2c2c41742fe26b2eb82938a1a8cdcf6d7 100644 (file)
--- a/src/panfrost/pandecode/pan_pretty_print.c
+++ b/src/panfrost/pandecode/pan_pretty_print.c
@@ -53,7 +53,7 @@ char *pandecode_format(enum mali_format format)
                 DEFINE_CASE(RGB10_A2UI);
                 DEFINE_CASE(RGB10_A2I);
                 DEFINE_CASE(RGB332_UNORM);
-                DEFINE_CASE(NV12);
+                DEFINE_CASE(RGB233_UNORM);
                 DEFINE_CASE(Z32_UNORM);
                 DEFINE_CASE(R32_FIXED);
                 DEFINE_CASE(RG32_FIXED);