drm/msm: drop msm_kms_funcs::get_format() callback

Now as all subdrivers were converted to use common database of formats,
drop the get_format() callback and use mdp_get_format() directly.

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

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index b966c44ec83533f7b2aabaeb0d6e9f9ae55b16f5..ef69c2f408c3e7c46f26044ccd2ec6cc1bbc6439 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -274,7 +274,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
 
        drm_mode_to_intf_timing_params(phys_enc, &mode, &timing_params);
 
-       fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);
+       fmt = mdp_get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);
        DPU_DEBUG_VIDENC(phys_enc, "fmt_fourcc 0x%X\n", fmt_fourcc);
 
        if (phys_enc->hw_cdm)
@@ -414,7 +414,7 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc)
 
        ctl = phys_enc->hw_ctl;
        fmt_fourcc = dpu_encoder_get_drm_fmt(phys_enc);
-       fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);
+       fmt = mdp_get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);
 
        DPU_DEBUG_VIDENC(phys_enc, "\n");
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
index de17bcbb8492c20c0df043d44f423e8c6ec7ac01..d3ea91c1d7d2ed42f5ff9280c9867789c9962e01 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
@@ -326,8 +326,7 @@ static void dpu_encoder_phys_wb_setup(
 
        wb_job = wb_enc->wb_job;
        format = msm_framebuffer_format(wb_enc->wb_job->fb);
-       dpu_fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base,
-                                                           format->pixel_format, wb_job->fb->modifier);
+       dpu_fmt = mdp_get_format(&phys_enc->dpu_kms->base, format->pixel_format, wb_job->fb->modifier);
 
        DPU_DEBUG("[mode_set:%d, \"%s\",%d,%d]\n",
                        hw_wb->idx - WB_0, mode.name,
@@ -577,7 +576,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc
 
        format = msm_framebuffer_format(job->fb);
 
-       wb_cfg->dest.format = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base,
+       wb_cfg->dest.format = mdp_get_format(&phys_enc->dpu_kms->base,
                                             format->pixel_format, job->fb->modifier);
        if (!wb_cfg->dest.format) {
                /* this error should be detected during atomic_check */

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index cb30137443e8f2d479f8878e0830959c4c79cbd4..1955848b1b78160c2da45164ffdd675cc96272f9 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -982,7 +982,6 @@ static const struct msm_kms_funcs kms_funcs = {
        .enable_vblank   = dpu_kms_enable_vblank,
        .disable_vblank  = dpu_kms_disable_vblank,
        .check_modified_format = dpu_format_check_modified_format,
-       .get_format      = mdp_get_format,
        .destroy         = dpu_kms_destroy,
        .snapshot        = dpu_kms_mdp_snapshot,
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index b92a13cc9b361ea2d4ecfd49d02049a552857b20..1c3a2657450c6d6f090eddf6e7d621bb1f71278e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -627,7 +627,7 @@ static void _dpu_plane_color_fill(struct dpu_plane *pdpu,
         * select fill format to match user property expectation,
         * h/w only supports RGB variants
         */
-       fmt = priv->kms->funcs->get_format(priv->kms, DRM_FORMAT_ABGR8888, 0);
+       fmt = mdp_get_format(priv->kms, DRM_FORMAT_ABGR8888, 0);
        /* should not happen ever */
        if (!fmt)
                return;

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
index 4ba1cb74ad7600e0f59f954471c4e9c468537ba5..6e4e74f9d63d6774eb2fa002febd4ea5224c32ef 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -151,7 +151,6 @@ static const struct mdp_kms_funcs kms_funcs = {
                .flush_commit    = mdp4_flush_commit,
                .wait_flush      = mdp4_wait_flush,
                .complete_commit = mdp4_complete_commit,
-               .get_format      = mdp_get_format,
                .round_pixclk    = mdp4_round_pixclk,
                .destroy         = mdp4_destroy,
        },

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index a874fd95cc20479ed34b31b1b6903d74a897cefd..374704cce65634ab6b673e17d1ef9dd65c7fdc94 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -224,7 +224,6 @@ static const struct mdp_kms_funcs kms_funcs = {
                .prepare_commit  = mdp5_prepare_commit,
                .wait_flush      = mdp5_wait_flush,
                .complete_commit = mdp5_complete_commit,
-               .get_format      = mdp_get_format,
                .destroy         = mdp5_kms_destroy,
        },
        .set_irqmask         = mdp5_set_irqmask,

diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index ad4bb2b2cd6678d9d7b73e510fb156a8eec9dc8b..09268e4168431c00f91843750253873e03164592 100644 (file)
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -181,7 +181,7 @@ static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
                      &mode_cmd->pixel_format);
 
        n = info->num_planes;
-       format = kms->funcs->get_format(kms, mode_cmd->pixel_format,
+       format = mdp_get_format(kms, mode_cmd->pixel_format,
                        mode_cmd->modifier[0]);
        if (!format) {
                DRM_DEV_ERROR(dev->dev, "unsupported pixel format: %p4cc\n",

diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index 0641f6111b93f6db2cb8130c8a2baffffa187f0a..1e0c54de3716cad6d02a7ace7bd22e6909c60556 100644 (file)
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -92,10 +92,6 @@ struct msm_kms_funcs {
         * Format handling:
         */
 
-       /* get msm_format w/ optional format modifiers from drm_mode_fb_cmd2 */
-       const struct msm_format *(*get_format)(struct msm_kms *kms,
-                                       const uint32_t format,
-                                       const uint64_t modifiers);
        /* do format checking on format modified through fb_cmd2 modifiers */
        int (*check_modified_format)(const struct msm_kms *kms,
                        const struct msm_format *msm_fmt,