From 23aa784c05cdac361c9518e6e7c00c198841c4d0 Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Tue, 7 Jan 2025 17:22:29 -0800 Subject: [PATCH] pan/format: Use HW version to determine siting for YUV 422 formats On v10, only YUV 420 formats support center_y or center siting. On previous HW versions, YUV 422 formats support center_y siting but not center_x or center siting. Fixes: 83c76cceafb4 ("panfrost: advertise YUV formats for valhall") Signed-off-by: Rebecca Mckeever Reviewed-by: Eric R. Smith Part-of: --- src/panfrost/lib/pan_format.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index 81dbd7a92ec..b6dc4a8df5d 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -137,6 +137,12 @@ const struct pan_blendable_format #define YUV_NO_SWAP (0) #define YUV_SWAP (1) +#if PAN_ARCH <= 9 +#define MALI_YUV_CR_SITING_CENTER_422 (MALI_YUV_CR_SITING_CENTER_Y) +#else +#define MALI_YUV_CR_SITING_CENTER_422 (MALI_YUV_CR_SITING_CENTER_X) +#endif + #define FMT_YUV(pipe, mali, swizzle, swap, siting, flags) \ [PIPE_FORMAT_##pipe] = { \ .hw = (MALI_YUV_SWIZZLE_##swizzle) | ((YUV_##swap) << 3) | \ @@ -170,20 +176,20 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = { #if PAN_ARCH >= 7 /* Multiplane formats */ - FMT_YUV(R8G8_R8B8_UNORM, YUYV8, UVYA, NO_SWAP, CENTER_Y, _T__), - FMT_YUV(G8R8_B8R8_UNORM, VYUY8, UYVA, SWAP, CENTER_Y, _T__), - FMT_YUV(R8B8_R8G8_UNORM, YUYV8, VYUA, NO_SWAP, CENTER_Y, _T__), - FMT_YUV(B8R8_G8R8_UNORM, VYUY8, VUYA, SWAP, CENTER_Y, _T__), + FMT_YUV(R8G8_R8B8_UNORM, YUYV8, UVYA, NO_SWAP, CENTER_422, _T__), + FMT_YUV(G8R8_B8R8_UNORM, VYUY8, UYVA, SWAP, CENTER_422, _T__), + FMT_YUV(R8B8_R8G8_UNORM, YUYV8, VYUA, NO_SWAP, CENTER_422, _T__), + FMT_YUV(B8R8_G8R8_UNORM, VYUY8, VUYA, SWAP, CENTER_422, _T__), FMT_YUV(R8_G8B8_420_UNORM, Y8_UV8_420, YUVA, NO_SWAP, CENTER, _T__), FMT_YUV(R8_B8G8_420_UNORM, Y8_UV8_420, YVUA, NO_SWAP, CENTER, _T__), FMT_YUV(R8_G8_B8_420_UNORM, Y8_U8_V8_420, YUVA, NO_SWAP, CENTER, _T__), FMT_YUV(R8_B8_G8_420_UNORM, Y8_U8_V8_420, YVUA, NO_SWAP, CENTER, _T__), - FMT_YUV(R8_G8B8_422_UNORM, Y8_UV8_422, YUVA, NO_SWAP, CENTER, _T__), - FMT_YUV(R8_B8G8_422_UNORM, Y8_UV8_422, YVUA, NO_SWAP, CENTER, _T__), + FMT_YUV(R8_G8B8_422_UNORM, Y8_UV8_422, YUVA, NO_SWAP, CENTER_422, _T__), + FMT_YUV(R8_B8G8_422_UNORM, Y8_UV8_422, YVUA, NO_SWAP, CENTER_422, _T__), FMT_YUV(R10_G10B10_420_UNORM, Y10_UV10_420, YUVA, NO_SWAP, CENTER, _T__), - FMT_YUV(R10_G10B10_422_UNORM, Y10_UV10_422, YUVA, NO_SWAP, CENTER, _T__), + FMT_YUV(R10_G10B10_422_UNORM, Y10_UV10_422, YUVA, NO_SWAP, CENTER_422, _T__), #endif FMTC(ETC1_RGB8, ETC2_RGB8, RGBA8_UNORM, RGB1, L),