Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/mediatek: Add new color format MACROs in OVL

Define new color formats to hide the bit operation in the MACROs to make
the switch statement more concise.
Change the MACROs to align the naming rule in DRM.

Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240620-igt-v3-9-a9d62d2e2c7e@mediatek.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

authored by

Hsiao Chien Sung and committed by
Chun-Kuang Hu
9f428b95 74608d8f

+8 -6
+8 -6
drivers/gpu/drm/mediatek/mtk_disp_ovl.c
··· 55 55 #define OVL_CON_BYTE_SWAP BIT(24) 56 56 #define OVL_CON_MTX_YUV_TO_RGB (6 << 16) 57 57 #define OVL_CON_CLRFMT_RGB (1 << 12) 58 - #define OVL_CON_CLRFMT_RGBA8888 (2 << 12) 59 - #define OVL_CON_CLRFMT_ARGB8888 (3 << 12) 58 + #define OVL_CON_CLRFMT_ARGB8888 (2 << 12) 59 + #define OVL_CON_CLRFMT_RGBA8888 (3 << 12) 60 + #define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP) 61 + #define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP) 60 62 #define OVL_CON_CLRFMT_UYVY (4 << 12) 61 63 #define OVL_CON_CLRFMT_YUYV (5 << 12) 62 64 #define OVL_CON_CLRFMT_RGB565(ovl) ((ovl)->data->fmt_rgb565_is_0 ? \ ··· 379 377 return OVL_CON_CLRFMT_RGB888(ovl) | OVL_CON_BYTE_SWAP; 380 378 case DRM_FORMAT_RGBX8888: 381 379 case DRM_FORMAT_RGBA8888: 382 - return OVL_CON_CLRFMT_ARGB8888; 380 + return OVL_CON_CLRFMT_RGBA8888; 383 381 case DRM_FORMAT_BGRX8888: 384 382 case DRM_FORMAT_BGRA8888: 385 383 case DRM_FORMAT_BGRA1010102: 386 - return OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP; 384 + return OVL_CON_CLRFMT_BGRA8888; 387 385 case DRM_FORMAT_XRGB8888: 388 386 case DRM_FORMAT_ARGB8888: 389 387 case DRM_FORMAT_ARGB2101010: 390 - return OVL_CON_CLRFMT_RGBA8888; 388 + return OVL_CON_CLRFMT_ARGB8888; 391 389 case DRM_FORMAT_XBGR8888: 392 390 case DRM_FORMAT_ABGR8888: 393 - return OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP; 391 + return OVL_CON_CLRFMT_ABGR8888; 394 392 case DRM_FORMAT_UYVY: 395 393 return OVL_CON_CLRFMT_UYVY | OVL_CON_MTX_YUV_TO_RGB; 396 394 case DRM_FORMAT_YUYV: