drm/msm: convert msm_format::unpack_tight to the flag

Instead of having a u8 or bool field unpack_tight, convert it to the
flag, this save space in the tables and allows us to handle all booleans
in the same way.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/590428/
Link: https://lore.kernel.org/r/20240420-dpu-format-v2-6-9e93226cbffd@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
index 855f0d29c387847e75326adc7073b9012089be22..705b91582b0fc4054a6e64465c7f21e9c6876d8d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
@@ -44,11 +44,10 @@ bp, flg, fm, np)                                                          \
        .bpc_a = a,                                                       \
        .chroma_sample = CHROMA_FULL,                                     \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = uc,                                               \
        .bpp = bp,                                                        \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = DPU_TILE_HEIGHT_DEFAULT                            \
 }
@@ -66,11 +65,10 @@ alpha, bp, flg, fm, np, th)                                               \
        .bpc_a = a,                                                       \
        .chroma_sample = CHROMA_FULL,                                     \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = uc,                                               \
        .bpp = bp,                                                        \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = th                                                 \
 }
@@ -89,11 +87,10 @@ alpha, chroma, count, bp, flg, fm, np)                                    \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = count,                                            \
        .bpp = bp,                                                        \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = DPU_TILE_HEIGHT_DEFAULT                            \
 }
@@ -110,11 +107,10 @@ alpha, chroma, count, bp, flg, fm, np)                                    \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = 2,                                                \
        .bpp = 2,                                                         \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = DPU_TILE_HEIGHT_DEFAULT                            \
 }
@@ -132,11 +128,10 @@ flg, fm, np, th)                                                          \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = 2,                                                \
        .bpp = 2,                                                         \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = th                                                 \
 }
@@ -153,7 +148,6 @@ flg, fm, np, th)                                                          \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 1,                                            \
-       .unpack_tight = 0,                                                \
        .unpack_count = 2,                                                \
        .bpp = 2,                                                         \
        .fetch_mode = fm,                                                 \
@@ -175,7 +169,6 @@ flg, fm, np, th)                                                          \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 1,                                            \
-       .unpack_tight = 0,                                                \
        .unpack_count = 2,                                                \
        .bpp = 2,                                                         \
        .fetch_mode = fm,                                                 \
@@ -198,11 +191,10 @@ flg, fm, np)                                                      \
        .bpc_a = a,                                                       \
        .chroma_sample = chroma,                                          \
        .unpack_align_msb = 0,                                            \
-       .unpack_tight = 1,                                                \
        .unpack_count = 1,                                                \
        .bpp = bp,                                                        \
        .fetch_mode = fm,                                                 \
-       .flags = flg,                                                     \
+       .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg,                      \
        .num_planes = np,                                                 \
        .tile_height = DPU_TILE_HEIGHT_DEFAULT                            \
 }
@@ -636,7 +628,7 @@ static int _dpu_format_get_media_color_ubwc(const struct msm_format *fmt)
        if (fmt->pixel_format == DRM_FORMAT_NV12 ||
            fmt->pixel_format == DRM_FORMAT_P010) {
                if (MSM_FORMAT_IS_DX(fmt)) {
-                       if (fmt->unpack_tight)
+                       if (fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT)
                                color_fmt = COLOR_FMT_NV12_BPP10_UBWC;
                        else
                                color_fmt = COLOR_FMT_P010_UBWC;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
index fdd77dc51776a1e07e8307b7cb95844e9032da09..d411d70b8cd85e64deb9e2152685d20403afb635 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -263,7 +263,7 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
        unpack = (fmt->element[3] << 24) | (fmt->element[2] << 16) |
                (fmt->element[1] << 8) | (fmt->element[0] << 0);
        src_format |= ((fmt->unpack_count - 1) << 12) |
-               (fmt->unpack_tight << 17) |
+               ((fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT ? 1 : 0) << 17) |
                (fmt->unpack_align_msb << 18) |
                ((fmt->bpp - 1) << 9);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
index 2fdf1b703042311288a31a1c647e8082538c9762..19163634855fd5e3b62a44836fa56760fcb3f548 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
@@ -98,7 +98,7 @@ static void dpu_hw_wb_setup_format(struct dpu_hw_wb *ctx,
                (fmt->element[0] << 0);
 
        dst_format |= (fmt->unpack_align_msb << 18) |
-               (fmt->unpack_tight << 17) |
+               ((fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT ? 1 : 0) << 17) |
                ((fmt->unpack_count - 1) << 12) |
                ((fmt->bpp - 1) << 9);
 

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
index cc94b0016d56cd599db836748c376e01ba30363b..890ef184801be87cce74e1ed891a8e2eb8fec190 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
@@ -325,7 +325,8 @@ static int mdp4_plane_mode_set(struct drm_plane *plane,
                        MDP4_PIPE_SRC_FORMAT_FETCH_PLANES(format->fetch_type) |
                        MDP4_PIPE_SRC_FORMAT_CHROMA_SAMP(format->chroma_sample) |
                        MDP4_PIPE_SRC_FORMAT_FRAME_FORMAT(frame_type) |
-                       COND(format->unpack_tight, MDP4_PIPE_SRC_FORMAT_UNPACK_TIGHT));
+                       COND(format->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT,
+                            MDP4_PIPE_SRC_FORMAT_UNPACK_TIGHT));
 
        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_UNPACK(pipe),
                        MDP4_PIPE_SRC_UNPACK_ELEM0(format->element[0]) |

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index 4ef102cb258868ad60a863e4a1fd0b603d2706fa..c5f02ad074306802b63a470c13d3bf3b9409fa0f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -801,7 +801,8 @@ static void mdp5_hwpipe_mode_set(struct mdp5_kms *mdp5_kms,
                        COND(format->alpha_enable, MDP5_PIPE_SRC_FORMAT_ALPHA_ENABLE) |
                        MDP5_PIPE_SRC_FORMAT_CPP(format->bpp - 1) |
                        MDP5_PIPE_SRC_FORMAT_UNPACK_COUNT(format->unpack_count - 1) |
-                       COND(format->unpack_tight, MDP5_PIPE_SRC_FORMAT_UNPACK_TIGHT) |
+                       COND(format->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT,
+                            MDP5_PIPE_SRC_FORMAT_UNPACK_TIGHT) |
                        MDP5_PIPE_SRC_FORMAT_FETCH_TYPE(format->fetch_type) |
                        MDP5_PIPE_SRC_FORMAT_CHROMA_SAMP(format->chroma_sample));
 

diff --git a/drivers/gpu/drm/msm/disp/mdp_format.c b/drivers/gpu/drm/msm/disp/mdp_format.c
index 5fc55f41e74f357374ead523c7a572f4602d0872..b9f0b13d25d5429c020c6456da378d1e7df989b1 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp_format.c
+++ b/drivers/gpu/drm/msm/disp/mdp_format.c
@@ -62,7 +62,7 @@ static struct csc_cfg csc_convert[CSC_MAX] = {
        },
 };
 
-#define FMT(name, a, r, g, b, e0, e1, e2, e3, alpha, tight, c, cnt, fp, cs, yuv) { \
+#define FMT(name, a, r, g, b, e0, e1, e2, e3, alpha, c, cnt, fp, cs, yuv) { \
                .pixel_format = DRM_FORMAT_ ## name,             \
                .bpc_a = BPC ## a ## A,                          \
                .bpc_r_cr = BPC ## r,                            \
@@ -72,65 +72,65 @@ static struct csc_cfg csc_convert[CSC_MAX] = {
                .fetch_type = fp,                                \
                .chroma_sample = cs,                             \
                .alpha_enable = alpha,                           \
-               .unpack_tight = tight,                           \
                .unpack_count = cnt,                             \
                .bpp = c,                                        \
-               .flags = yuv ? MSM_FORMAT_FLAG_YUV : 0,          \
+               .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT |          \
+                       (yuv ? MSM_FORMAT_FLAG_YUV : 0),         \
 }
 
 #define BPC0A 0
 
 static const struct msm_format formats[] = {
-       /*  name      a  r  g  b   e0 e1 e2 e3  alpha   tight  cpp cnt ... */
-       FMT(ARGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  true,   true,  4,  4,
+       /*  name      a  r  g  b   e0 e1 e2 e3  alpha   cpp cnt ... */
+       FMT(ARGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  true,   4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(ABGR8888, 8, 8, 8, 8,  2, 0, 1, 3,  true,   true,  4,  4,
+       FMT(ABGR8888, 8, 8, 8, 8,  2, 0, 1, 3,  true,   4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(RGBA8888, 8, 8, 8, 8,  3, 1, 0, 2,  true,   true,  4,  4,
+       FMT(RGBA8888, 8, 8, 8, 8,  3, 1, 0, 2,  true,   4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(BGRA8888, 8, 8, 8, 8,  3, 2, 0, 1,  true,   true,  4,  4,
+       FMT(BGRA8888, 8, 8, 8, 8,  3, 2, 0, 1,  true,   4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(XRGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  false,  true,  4,  4,
+       FMT(XRGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  false,  4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(XBGR8888, 8, 8, 8, 8,  2, 0, 1, 3,  false,   true,  4,  4,
+       FMT(XBGR8888, 8, 8, 8, 8,  2, 0, 1, 3,  false,  4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(RGBX8888, 8, 8, 8, 8,  3, 1, 0, 2,  false,   true,  4,  4,
+       FMT(RGBX8888, 8, 8, 8, 8,  3, 1, 0, 2,  false,  4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(BGRX8888, 8, 8, 8, 8,  3, 2, 0, 1,  false,   true,  4,  4,
+       FMT(BGRX8888, 8, 8, 8, 8,  3, 2, 0, 1,  false,  4,  4,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(RGB888,   0, 8, 8, 8,  1, 0, 2, 0,  false,  true,  3,  3,
+       FMT(RGB888,   0, 8, 8, 8,  1, 0, 2, 0,  false,  3,  3,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(BGR888,   0, 8, 8, 8,  2, 0, 1, 0,  false,  true,  3,  3,
+       FMT(BGR888,   0, 8, 8, 8,  2, 0, 1, 0,  false,  3,  3,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(RGB565,   0, 5, 6, 5,  1, 0, 2, 0,  false,  true,  2,  3,
+       FMT(RGB565,   0, 5, 6, 5,  1, 0, 2, 0,  false,  2,  3,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
-       FMT(BGR565,   0, 5, 6, 5,  2, 0, 1, 0,  false,  true,  2,  3,
+       FMT(BGR565,   0, 5, 6, 5,  2, 0, 1, 0,  false,  2,  3,
                        MDP_PLANE_INTERLEAVED, CHROMA_FULL, false),
 
        /* --- RGB formats above / YUV formats below this line --- */
 
        /* 2 plane YUV */
-       FMT(NV12,     0, 8, 8, 8,  1, 2, 0, 0,  false,  true,  2, 2,
+       FMT(NV12,     0, 8, 8, 8,  1, 2, 0, 0,  false,  2, 2,
                        MDP_PLANE_PSEUDO_PLANAR, CHROMA_420, true),
-       FMT(NV21,     0, 8, 8, 8,  2, 1, 0, 0,  false,  true,  2, 2,
+       FMT(NV21,     0, 8, 8, 8,  2, 1, 0, 0,  false,  2, 2,
                        MDP_PLANE_PSEUDO_PLANAR, CHROMA_420, true),
-       FMT(NV16,     0, 8, 8, 8,  1, 2, 0, 0,  false,  true,  2, 2,
+       FMT(NV16,     0, 8, 8, 8,  1, 2, 0, 0,  false,  2, 2,
                        MDP_PLANE_PSEUDO_PLANAR, CHROMA_H2V1, true),
-       FMT(NV61,     0, 8, 8, 8,  2, 1, 0, 0,  false,  true,  2, 2,
+       FMT(NV61,     0, 8, 8, 8,  2, 1, 0, 0,  false,  2, 2,
                        MDP_PLANE_PSEUDO_PLANAR, CHROMA_H2V1, true),
        /* 1 plane YUV */
-       FMT(VYUY,     0, 8, 8, 8,  2, 0, 1, 0,  false,  true,  2, 4,
+       FMT(VYUY,     0, 8, 8, 8,  2, 0, 1, 0,  false,  2, 4,
                        MDP_PLANE_INTERLEAVED, CHROMA_H2V1, true),
-       FMT(UYVY,     0, 8, 8, 8,  1, 0, 2, 0,  false,  true,  2, 4,
+       FMT(UYVY,     0, 8, 8, 8,  1, 0, 2, 0,  false,  2, 4,
                        MDP_PLANE_INTERLEAVED, CHROMA_H2V1, true),
-       FMT(YUYV,     0, 8, 8, 8,  0, 1, 0, 2,  false,  true,  2, 4,
+       FMT(YUYV,     0, 8, 8, 8,  0, 1, 0, 2,  false,  2, 4,
                        MDP_PLANE_INTERLEAVED, CHROMA_H2V1, true),
-       FMT(YVYU,     0, 8, 8, 8,  0, 2, 0, 1,  false,  true,  2, 4,
+       FMT(YVYU,     0, 8, 8, 8,  0, 2, 0, 1,  false,  2, 4,
                        MDP_PLANE_INTERLEAVED, CHROMA_H2V1, true),
        /* 3 plane YUV */
-       FMT(YUV420,   0, 8, 8, 8,  2, 1, 0, 0,  false,  true,  1, 1,
+       FMT(YUV420,   0, 8, 8, 8,  2, 1, 0, 0,  false,  1, 1,
                        MDP_PLANE_PLANAR, CHROMA_420, true),
-       FMT(YVU420,   0, 8, 8, 8,  1, 2, 0, 0,  false,  true,  1, 1,
+       FMT(YVU420,   0, 8, 8, 8,  1, 2, 0, 0,  false,  1, 1,
                        MDP_PLANE_PLANAR, CHROMA_420, true),
 };
 

diff --git a/drivers/gpu/drm/msm/disp/mdp_format.h b/drivers/gpu/drm/msm/disp/mdp_format.h
index 6443d53954eef6f42cc9c852545c827c3c593936..18b2822dd5524b8387872fdbc9a087c438df4bb7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp_format.h
+++ b/drivers/gpu/drm/msm/disp/mdp_format.h
@@ -14,11 +14,13 @@ enum msm_format_flags {
        MSM_FORMAT_FLAG_YUV_BIT,
        MSM_FORMAT_FLAG_DX_BIT,
        MSM_FORMAT_FLAG_COMPRESSED_BIT,
+       MSM_FORMAT_FLAG_UNPACK_TIGHT_BIT,
 };
 
 #define MSM_FORMAT_FLAG_YUV            BIT(MSM_FORMAT_FLAG_YUV_BIT)
 #define MSM_FORMAT_FLAG_DX             BIT(MSM_FORMAT_FLAG_DX_BIT)
 #define MSM_FORMAT_FLAG_COMPRESSED     BIT(MSM_FORMAT_FLAG_COMPRESSED_BIT)
+#define MSM_FORMAT_FLAG_UNPACK_TIGHT   BIT(MSM_FORMAT_FLAG_UNPACK_TIGHT_BIT)
 
 /**
  * struct msm_format: defines the format configuration
@@ -27,7 +29,6 @@ enum msm_format_flags {
  * @fetch_type: how the color components are packed in pixel format
  * @chroma_sample: chroma sub-samplng type
  * @alpha_enable: whether the format has an alpha channel
- * @unpack_tight: whether to use tight or loose unpack
  * @unpack_align_msb: unpack aligned to LSB or MSB
  * @unpack_count: number of the components to unpack
  * @bpp: bytes per pixel
@@ -44,7 +45,6 @@ struct msm_format {
        enum mdp_fetch_type fetch_type;
        enum mdp_chroma_samp_type chroma_sample;
        bool alpha_enable;
-       u8 unpack_tight;
        u8 unpack_align_msb;
        u8 unpack_count;
        u8 bpp;