mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
drm/msm/disp: pull in common YUV format parameters
Pull common params of YUV formats into corresponding macro definitions, simplifying format table. Reviewed-by: Jessica Zhang <jessica.zhang@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/688171/ Link: https://lore.kernel.org/r/20251114-dpu-formats-v3-6-cae312379d49@oss.qualcomm.com Tested-by: Luca Weiss <luca.weiss@fairphone.com> # qcm6490-fairphone-fp5 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
This commit is contained in:
parent
2bd6ae0edf
commit
72ca4e9d04
|
|
@ -244,27 +244,27 @@ static struct csc_cfg csc_convert[CSC_MAX] = {
|
|||
.tile_height = MDP_TILE_HEIGHT_UBWC, \
|
||||
}
|
||||
|
||||
#define INTERLEAVED_YUV_FMT(fmt, a, r, g, b, e0, e1, e2, e3, \
|
||||
alpha, chroma, count, bp, flg, fm, np) \
|
||||
#define INTERLEAVED_YUV_FMT(fmt, bp, r, g, b, e0, e1, e2, e3, chroma) \
|
||||
{ \
|
||||
.pixel_format = DRM_FORMAT_ ## fmt, \
|
||||
.fetch_type = MDP_PLANE_INTERLEAVED, \
|
||||
.alpha_enable = alpha, \
|
||||
.alpha_enable = false, \
|
||||
.element = { (e0), (e1), (e2), (e3)}, \
|
||||
.bpc_g_y = g, \
|
||||
.bpc_b_cb = b, \
|
||||
.bpc_r_cr = r, \
|
||||
.bpc_a = a, \
|
||||
.bpc_a = 0, \
|
||||
.chroma_sample = chroma, \
|
||||
.unpack_count = count, \
|
||||
.unpack_count = 4, \
|
||||
.bpp = bp, \
|
||||
.fetch_mode = fm, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg, \
|
||||
.num_planes = np, \
|
||||
.fetch_mode = MDP_FETCH_LINEAR, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | \
|
||||
MSM_FORMAT_FLAG_YUV, \
|
||||
.num_planes = 1, \
|
||||
.tile_height = MDP_TILE_HEIGHT_DEFAULT \
|
||||
}
|
||||
|
||||
#define PSEUDO_YUV_FMT(fmt, a, r, g, b, e0, e1, chroma, flg, fm, np) \
|
||||
#define PSEUDO_YUV_FMT(fmt, r, g, b, e0, e1, chroma) \
|
||||
{ \
|
||||
.pixel_format = DRM_FORMAT_ ## fmt, \
|
||||
.fetch_type = MDP_PLANE_PSEUDO_PLANAR, \
|
||||
|
|
@ -273,13 +273,14 @@ alpha, chroma, count, bp, flg, fm, np) \
|
|||
.bpc_g_y = g, \
|
||||
.bpc_b_cb = b, \
|
||||
.bpc_r_cr = r, \
|
||||
.bpc_a = a, \
|
||||
.bpc_a = 0, \
|
||||
.chroma_sample = chroma, \
|
||||
.unpack_count = 2, \
|
||||
.bpp = 2, \
|
||||
.fetch_mode = fm, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg, \
|
||||
.num_planes = np, \
|
||||
.fetch_mode = MDP_FETCH_LINEAR, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | \
|
||||
MSM_FORMAT_FLAG_YUV, \
|
||||
.num_planes = 2, \
|
||||
.tile_height = MDP_TILE_HEIGHT_DEFAULT \
|
||||
}
|
||||
|
||||
|
|
@ -303,7 +304,7 @@ flg, fm, np, th) \
|
|||
.tile_height = th \
|
||||
}
|
||||
|
||||
#define PSEUDO_YUV_FMT_LOOSE(fmt, a, r, g, b, e0, e1, chroma, flg, fm, np)\
|
||||
#define PSEUDO_YUV_FMT_LOOSE(fmt, r, g, b, e0, e1, chroma) \
|
||||
{ \
|
||||
.pixel_format = DRM_FORMAT_ ## fmt, \
|
||||
.fetch_type = MDP_PLANE_PSEUDO_PLANAR, \
|
||||
|
|
@ -312,13 +313,15 @@ flg, fm, np, th) \
|
|||
.bpc_g_y = g, \
|
||||
.bpc_b_cb = b, \
|
||||
.bpc_r_cr = r, \
|
||||
.bpc_a = a, \
|
||||
.bpc_a = 0, \
|
||||
.chroma_sample = chroma, \
|
||||
.unpack_count = 2, \
|
||||
.bpp = 2, \
|
||||
.fetch_mode = fm, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_ALIGN_MSB | flg, \
|
||||
.num_planes = np, \
|
||||
.fetch_mode = MDP_FETCH_LINEAR, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_ALIGN_MSB | \
|
||||
MSM_FORMAT_FLAG_DX | \
|
||||
MSM_FORMAT_FLAG_YUV, \
|
||||
.num_planes = 2, \
|
||||
.tile_height = MDP_TILE_HEIGHT_DEFAULT \
|
||||
}
|
||||
|
||||
|
|
@ -342,23 +345,23 @@ flg, fm, np, th) \
|
|||
.tile_height = th \
|
||||
}
|
||||
|
||||
#define PLANAR_YUV_FMT(fmt, a, r, g, b, e0, e1, e2, alpha, chroma, bp, \
|
||||
flg, fm, np) \
|
||||
#define PLANAR_YUV_FMT(fmt, bp, r, g, b, e0, e1, e2, chroma) \
|
||||
{ \
|
||||
.pixel_format = DRM_FORMAT_ ## fmt, \
|
||||
.fetch_type = MDP_PLANE_PLANAR, \
|
||||
.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 = a, \
|
||||
.bpc_a = 0, \
|
||||
.chroma_sample = chroma, \
|
||||
.unpack_count = 1, \
|
||||
.bpp = bp, \
|
||||
.fetch_mode = fm, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg, \
|
||||
.num_planes = np, \
|
||||
.fetch_mode = MDP_FETCH_LINEAR, \
|
||||
.flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | \
|
||||
MSM_FORMAT_FLAG_YUV, \
|
||||
.num_planes = 3, \
|
||||
.tile_height = MDP_TILE_HEIGHT_DEFAULT \
|
||||
}
|
||||
|
||||
|
|
@ -511,72 +514,61 @@ static const struct msm_format mdp_formats[] = {
|
|||
|
||||
/* 2 plane YUV */
|
||||
PSEUDO_YUV_FMT(NV12,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
BPC8, BPC8, BPC8,
|
||||
C1_B_Cb, C2_R_Cr,
|
||||
CHROMA_420, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 2),
|
||||
CHROMA_420),
|
||||
|
||||
PSEUDO_YUV_FMT(NV21,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
BPC8, BPC8, BPC8,
|
||||
C2_R_Cr, C1_B_Cb,
|
||||
CHROMA_420, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 2),
|
||||
CHROMA_420),
|
||||
|
||||
PSEUDO_YUV_FMT(NV16,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
BPC8, BPC8, BPC8,
|
||||
C1_B_Cb, C2_R_Cr,
|
||||
CHROMA_H2V1, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 2),
|
||||
CHROMA_H2V1),
|
||||
|
||||
PSEUDO_YUV_FMT(NV61,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
BPC8, BPC8, BPC8,
|
||||
C2_R_Cr, C1_B_Cb,
|
||||
CHROMA_H2V1, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 2),
|
||||
CHROMA_H2V1),
|
||||
|
||||
PSEUDO_YUV_FMT_LOOSE(P010,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
BPC8, BPC8, BPC8,
|
||||
C1_B_Cb, C2_R_Cr,
|
||||
CHROMA_420, MSM_FORMAT_FLAG_DX | MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 2),
|
||||
CHROMA_420),
|
||||
|
||||
/* 1 plane YUV */
|
||||
INTERLEAVED_YUV_FMT(VYUY,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
INTERLEAVED_YUV_FMT(VYUY, 2,
|
||||
BPC8, BPC8, BPC8,
|
||||
C2_R_Cr, C0_G_Y, C1_B_Cb, C0_G_Y,
|
||||
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 1),
|
||||
CHROMA_H2V1),
|
||||
|
||||
INTERLEAVED_YUV_FMT(UYVY,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
INTERLEAVED_YUV_FMT(UYVY, 2,
|
||||
BPC8, BPC8, BPC8,
|
||||
C1_B_Cb, C0_G_Y, C2_R_Cr, C0_G_Y,
|
||||
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 1),
|
||||
CHROMA_H2V1),
|
||||
|
||||
INTERLEAVED_YUV_FMT(YUYV,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
INTERLEAVED_YUV_FMT(YUYV, 2,
|
||||
BPC8, BPC8, BPC8,
|
||||
C0_G_Y, C1_B_Cb, C0_G_Y, C2_R_Cr,
|
||||
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 1),
|
||||
CHROMA_H2V1),
|
||||
|
||||
INTERLEAVED_YUV_FMT(YVYU,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
INTERLEAVED_YUV_FMT(YVYU, 2,
|
||||
BPC8, BPC8, BPC8,
|
||||
C0_G_Y, C2_R_Cr, C0_G_Y, C1_B_Cb,
|
||||
false, CHROMA_H2V1, 4, 2, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 1),
|
||||
CHROMA_H2V1),
|
||||
|
||||
/* 3 plane YUV */
|
||||
PLANAR_YUV_FMT(YUV420,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
PLANAR_YUV_FMT(YUV420, 1,
|
||||
BPC8, BPC8, BPC8,
|
||||
C2_R_Cr, C1_B_Cb, C0_G_Y,
|
||||
false, CHROMA_420, 1, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 3),
|
||||
CHROMA_420),
|
||||
|
||||
PLANAR_YUV_FMT(YVU420,
|
||||
0, BPC8, BPC8, BPC8,
|
||||
PLANAR_YUV_FMT(YVU420, 1,
|
||||
BPC8, BPC8, BPC8,
|
||||
C1_B_Cb, C2_R_Cr, C0_G_Y,
|
||||
false, CHROMA_420, 1, MSM_FORMAT_FLAG_YUV,
|
||||
MDP_FETCH_LINEAR, 3),
|
||||
CHROMA_420),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user