| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <e15b8695-08dd-49b2-a0e4-f1957026bf8f@oss.qualcomm.com>
Date: Thu, 4 Sep 2025 16:05:23 -0700
From: Jessica Zhang <jessica.zhang@....qualcomm.com>
To: Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>,
Rob Clark <robin.clark@....qualcomm.com>,
Dmitry Baryshkov
<lumag@...nel.org>,
Abhinav Kumar <abhinav.kumar@...ux.dev>, Sean Paul <sean@...rly.run>,
Marijn Suijten <marijn.suijten@...ainline.org>,
David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>,
Jordan Crouse <jordan@...micpenguin.net>
Cc: linux-arm-msm@...r.kernel.org, dri-devel@...ts.freedesktop.org,
freedreno@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 04/12] drm/msm/disp: simplify RGB{,A,X} formats
definitions
On 7/4/2025 7:47 PM, Dmitry Baryshkov wrote:
> Define several additional macros, capturing RGB format classes, in order
> to simplify defining particular RGB* format.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>
Reviewed-by: Jessica Zhang <jessica.zhang@....qualcomm.com>
> ---
> drivers/gpu/drm/msm/disp/mdp_format.c | 275 +++++++++++++++++++---------------
> 1 file changed, 158 insertions(+), 117 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp_format.c b/drivers/gpu/drm/msm/disp/mdp_format.c
> index 09a5bffd838b8a4fd3c22622e82dcf9fb99b5117..28cef986f2d662484afd47440a79393c48256ff5 100644
> --- a/drivers/gpu/drm/msm/disp/mdp_format.c
> +++ b/drivers/gpu/drm/msm/disp/mdp_format.c
> @@ -66,22 +66,99 @@ static struct csc_cfg csc_convert[CSC_MAX] = {
> #define MDP_TILE_HEIGHT_UBWC 4
> #define MDP_TILE_HEIGHT_NV12 8
>
> -#define INTERLEAVED_RGB_FMT(fmt, a, r, g, b, e0, e1, e2, e3, uc, alpha, \
> -bp, flg) \
> +#define INTERLEAVED_RGB_FMT(fmt, bp, r, g, b, e0, e1, e2) \
> { \
> .pixel_format = DRM_FORMAT_ ## fmt, \
> .fetch_type = MDP_PLANE_INTERLEAVED, \
> - .alpha_enable = alpha, \
> + .alpha_enable = false, \
> + .element = { (e0), (e1), (e2), 0 }, \
> + .bpc_g_y = g, \
> + .bpc_b_cb = b, \
> + .bpc_r_cr = r, \
> + .bpc_a = 0, \
> + .chroma_sample = CHROMA_FULL, \
> + .unpack_count = 3, \
> + .bpp = bp, \
> + .fetch_mode = MDP_FETCH_LINEAR, \
> + .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT, \
> + .num_planes = 1, \
> + .tile_height = MDP_TILE_HEIGHT_DEFAULT \
> +}
> +
> +#define INTERLEAVED_RGBA_FMT(fmt, bp, a, r, g, b, e0, e1, e2, e3) \
> +{ \
> + .pixel_format = DRM_FORMAT_ ## fmt, \
> + .fetch_type = MDP_PLANE_INTERLEAVED, \
> + .alpha_enable = true, \
> .element = { (e0), (e1), (e2), (e3) }, \
> .bpc_g_y = g, \
> .bpc_b_cb = b, \
> .bpc_r_cr = r, \
> .bpc_a = a, \
> .chroma_sample = CHROMA_FULL, \
> - .unpack_count = uc, \
> + .unpack_count = 4, \
> .bpp = bp, \
> .fetch_mode = MDP_FETCH_LINEAR, \
> - .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg, \
> + .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT, \
> + .num_planes = 1, \
> + .tile_height = MDP_TILE_HEIGHT_DEFAULT \
> +}
> +
> +#define INTERLEAVED_RGBX_FMT(fmt, bp, a, r, g, b, e0, e1, e2, e3) \
> +{ \
> + .pixel_format = DRM_FORMAT_ ## fmt, \
> + .fetch_type = MDP_PLANE_INTERLEAVED, \
> + .alpha_enable = false, \
> + .element = { (e0), (e1), (e2), (e3) }, \
> + .bpc_g_y = g, \
> + .bpc_b_cb = b, \
> + .bpc_r_cr = r, \
> + .bpc_a = a, \
> + .chroma_sample = CHROMA_FULL, \
> + .unpack_count = 4, \
> + .bpp = bp, \
> + .fetch_mode = MDP_FETCH_LINEAR, \
> + .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT, \
> + .num_planes = 1, \
> + .tile_height = MDP_TILE_HEIGHT_DEFAULT \
> +}
> +
> +#define INTERLEAVED_RGBA_DX_FMT(fmt, bp, a, r, g, b, e0, e1, e2, e3) \
> +{ \
> + .pixel_format = DRM_FORMAT_ ## fmt, \
> + .fetch_type = MDP_PLANE_INTERLEAVED, \
> + .alpha_enable = true, \
> + .element = { (e0), (e1), (e2), (e3) }, \
> + .bpc_g_y = g, \
> + .bpc_b_cb = b, \
> + .bpc_r_cr = r, \
> + .bpc_a = a, \
> + .chroma_sample = CHROMA_FULL, \
> + .unpack_count = 4, \
> + .bpp = bp, \
> + .fetch_mode = MDP_FETCH_LINEAR, \
> + .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | \
> + MSM_FORMAT_FLAG_DX, \
> + .num_planes = 1, \
> + .tile_height = MDP_TILE_HEIGHT_DEFAULT \
> +}
> +
> +#define INTERLEAVED_RGBX_DX_FMT(fmt, bp, a, r, g, b, e0, e1, e2, e3) \
> +{ \
> + .pixel_format = DRM_FORMAT_ ## fmt, \
> + .fetch_type = MDP_PLANE_INTERLEAVED, \
> + .alpha_enable = false, \
> + .element = { (e0), (e1), (e2), (e3) }, \
> + .bpc_g_y = g, \
> + .bpc_b_cb = b, \
> + .bpc_r_cr = r, \
> + .bpc_a = a, \
> + .chroma_sample = CHROMA_FULL, \
> + .unpack_count = 4, \
> + .bpp = bp, \
> + .fetch_mode = MDP_FETCH_LINEAR, \
> + .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | \
> + MSM_FORMAT_FLAG_DX, \
> .num_planes = 1, \
> .tile_height = MDP_TILE_HEIGHT_DEFAULT \
> }
> @@ -225,185 +302,149 @@ flg, fm, np) \
> }
>
> static const struct msm_format mdp_formats[] = {
> - INTERLEAVED_RGB_FMT(ARGB8888,
> + INTERLEAVED_RGBA_FMT(ARGB8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - true, 4, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(ABGR8888,
> + INTERLEAVED_RGBA_FMT(ABGR8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - true, 4, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(XBGR8888,
> + INTERLEAVED_RGBX_FMT(XBGR8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - false, 4, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBA8888,
> + INTERLEAVED_RGBA_FMT(RGBA8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - true, 4, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGRA8888,
> + INTERLEAVED_RGBA_FMT(BGRA8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - true, 4, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(BGRX8888,
> + INTERLEAVED_RGBX_FMT(BGRX8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - false, 4, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(XRGB8888,
> + INTERLEAVED_RGBX_FMT(XRGB8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - false, 4, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBX8888,
> + INTERLEAVED_RGBX_FMT(RGBX8888, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - false, 4, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(RGB888,
> - 0, BPC8, BPC8, BPC8,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,
> - false, 3, 0),
> + INTERLEAVED_RGB_FMT(RGB888, 3,
> + BPC8, BPC8, BPC8,
> + C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGR888,
> - 0, BPC8, BPC8, BPC8,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,
> - false, 3, 0),
> + INTERLEAVED_RGB_FMT(BGR888, 3,
> + BPC8, BPC8, BPC8,
> + C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(RGB565,
> - 0, BPC5, BPC6, BPC5,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,
> - false, 2, 0),
> + INTERLEAVED_RGB_FMT(RGB565, 2,
> + BPC5, BPC6, BPC5,
> + C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGR565,
> - 0, BPC5, BPC6, BPC5,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,
> - false, 2, 0),
> + INTERLEAVED_RGB_FMT(BGR565, 2,
> + BPC5, BPC6, BPC5,
> + C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(ARGB1555,
> + INTERLEAVED_RGBA_FMT(ARGB1555, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - true, 2, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(ABGR1555,
> + INTERLEAVED_RGBA_FMT(ABGR1555, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - true, 2, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBA5551,
> + INTERLEAVED_RGBA_FMT(RGBA5551, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - true, 2, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGRA5551,
> + INTERLEAVED_RGBA_FMT(BGRA5551, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - true, 2, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(XRGB1555,
> + INTERLEAVED_RGBX_FMT(XRGB1555, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - false, 2, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(XBGR1555,
> + INTERLEAVED_RGBX_FMT(XBGR1555, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - false, 2, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBX5551,
> + INTERLEAVED_RGBX_FMT(RGBX5551, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - false, 2, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGRX5551,
> + INTERLEAVED_RGBX_FMT(BGRX5551, 2,
> BPC1A, BPC5, BPC5, BPC5,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - false, 2, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(ARGB4444,
> + INTERLEAVED_RGBA_FMT(ARGB4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - true, 2, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(ABGR4444,
> + INTERLEAVED_RGBA_FMT(ABGR4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - true, 2, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBA4444,
> + INTERLEAVED_RGBA_FMT(RGBA4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - true, 2, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGRA4444,
> + INTERLEAVED_RGBA_FMT(BGRA4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - true, 2, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(XRGB4444,
> + INTERLEAVED_RGBX_FMT(XRGB4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - false, 2, 0),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(XBGR4444,
> + INTERLEAVED_RGBX_FMT(XBGR4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - false, 2, 0),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBX4444,
> + INTERLEAVED_RGBX_FMT(RGBX4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - false, 2, 0),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(BGRX4444,
> + INTERLEAVED_RGBX_FMT(BGRX4444, 2,
> BPC4A, BPC4, BPC4, BPC4,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - false, 2, 0),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(BGRA1010102,
> + INTERLEAVED_RGBA_DX_FMT(BGRA1010102, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - true, 4, MSM_FORMAT_FLAG_DX),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(RGBA1010102,
> + INTERLEAVED_RGBA_DX_FMT(RGBA1010102, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - true, 4, MSM_FORMAT_FLAG_DX),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> - INTERLEAVED_RGB_FMT(ABGR2101010,
> + INTERLEAVED_RGBA_DX_FMT(ABGR2101010, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - true, 4, MSM_FORMAT_FLAG_DX),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(ARGB2101010,
> + INTERLEAVED_RGBA_DX_FMT(ARGB2101010, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - true, 4, MSM_FORMAT_FLAG_DX),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(XRGB2101010,
> + INTERLEAVED_RGBX_DX_FMT(XRGB2101010, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,
> - false, 4, MSM_FORMAT_FLAG_DX),
> + C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(BGRX1010102,
> + INTERLEAVED_RGBX_DX_FMT(BGRX1010102, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,
> - false, 4, MSM_FORMAT_FLAG_DX),
> + C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb),
>
> - INTERLEAVED_RGB_FMT(XBGR2101010,
> + INTERLEAVED_RGBX_DX_FMT(XBGR2101010, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
> - false, 4, MSM_FORMAT_FLAG_DX),
> + C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA),
>
> - INTERLEAVED_RGB_FMT(RGBX1010102,
> + INTERLEAVED_RGBX_DX_FMT(RGBX1010102, 4,
> BPC8A, BPC8, BPC8, BPC8,
> - C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,
> - false, 4, MSM_FORMAT_FLAG_DX),
> + C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr),
>
> /* --- RGB formats above / YUV formats below this line --- */
>
>
Powered by blists - more mailing lists