From 50e3b2e3904074422f5d4d9ceccfc3cce64199eb Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Tue, 24 Mar 2020 17:33:22 +1300 Subject: [PATCH] panfrost: Correctly identify format 0x4c Reviewed-by: Alyssa Rosenzweig Tested-by: Marge Bot Part-of: --- src/panfrost/encoder/pan_format.c | 3 --- src/panfrost/include/panfrost-job.h | 6 ++---- src/panfrost/pandecode/pan_pretty_print.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/panfrost/encoder/pan_format.c b/src/panfrost/encoder/pan_format.c index 89f4695deaa..873c4d227d2 100644 --- 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 a409f15147e..118d8beb96f 100644 --- 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 96ef7d7b2c3..a1a87fa2c2c 100644 --- 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); -- 2.30.2