drm/msm/dpu: drop dpu_format_check_modified_format

The msm_kms_funcs::check_modified_format() callback is not used by the
driver. Drop it completely.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Abhinav Kumar <quic_abhinavk@quicinc.com> # sc7280
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/612239/
Link: https://lore.kernel.org/r/20240903-dpu-mode-config-width-v6-4-617e1ecc4b7a@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 6b1e9a617da329dbce67f71539ae4dc3b53bb314..027eb5ecff08490fcd65db52d533e37ed269d7fc 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
@@ -423,46 +423,3 @@ int dpu_format_populate_layout(
 
        return ret;
 }
-
-int dpu_format_check_modified_format(
-               const struct msm_kms *kms,
-               const struct msm_format *fmt,
-               const struct drm_mode_fb_cmd2 *cmd,
-               struct drm_gem_object **bos)
-{
-       const struct drm_format_info *info;
-       struct dpu_hw_fmt_layout layout;
-       uint32_t bos_total_size = 0;
-       int ret, i;
-
-       if (!fmt || !cmd || !bos) {
-               DRM_ERROR("invalid arguments\n");
-               return -EINVAL;
-       }
-
-       info = drm_format_info(fmt->pixel_format);
-       if (!info)
-               return -EINVAL;
-
-       ret = dpu_format_get_plane_sizes(fmt, cmd->width, cmd->height,
-                       &layout, cmd->pitches);
-       if (ret)
-               return ret;
-
-       for (i = 0; i < info->num_planes; i++) {
-               if (!bos[i]) {
-                       DRM_ERROR("invalid handle for plane %d\n", i);
-                       return -EINVAL;
-               }
-               if ((i == 0) || (bos[i] != bos[0]))
-                       bos_total_size += bos[i]->size;
-       }
-
-       if (bos_total_size < layout.total_size) {
-               DRM_ERROR("buffers total size too small %u expected %u\n",
-                               bos_total_size, layout.total_size);
-               return -EINVAL;
-       }
-
-       return 0;
-}

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
index 210d0ed5f0af8e5e69f540720b9498935d86eb69..ef1239c950588c8e372f7fe0566f82ab11a2acc8 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
@@ -31,22 +31,6 @@ static inline bool dpu_find_format(u32 format, const u32 *supported_formats,
        return false;
 }
 
-/**
- * dpu_format_check_modified_format - validate format and buffers for
- *                   dpu non-standard, i.e. modified format
- * @kms:             kms driver
- * @msm_fmt:         pointer to the msm_fmt base pointer of an msm_format
- * @cmd:             fb_cmd2 structure user request
- * @bos:             gem buffer object list
- *
- * Return: error code on failure, 0 on success
- */
-int dpu_format_check_modified_format(
-               const struct msm_kms *kms,
-               const struct msm_format *msm_fmt,
-               const struct drm_mode_fb_cmd2 *cmd,
-               struct drm_gem_object **bos);
-
 /**
  * dpu_format_populate_layout - populate the given format layout based on
  *                     mmu, fb, and format found in the fb

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 3e75fb2e286f2ea9ffefe99d0f31edb5277fdfa0..639f94852ead71c30dc956ee854c819778579263 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1025,7 +1025,6 @@ static const struct msm_kms_funcs kms_funcs = {
        .complete_commit = dpu_kms_complete_commit,
        .enable_vblank   = dpu_kms_enable_vblank,
        .disable_vblank  = dpu_kms_disable_vblank,
-       .check_modified_format = dpu_format_check_modified_format,
        .destroy         = dpu_kms_destroy,
        .snapshot        = dpu_kms_mdp_snapshot,
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index 1e0c54de3716cad6d02a7ace7bd22e6909c60556..e60162744c669773b6e5aef824a173647626ab4e 100644 (file)
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -92,12 +92,6 @@ struct msm_kms_funcs {
         * Format handling:
         */
 
-       /* 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,
-                       const struct drm_mode_fb_cmd2 *cmd,
-                       struct drm_gem_object **bos);
-
        /* misc: */
        long (*round_pixclk)(struct msm_kms *kms, unsigned long rate,
                        struct drm_encoder *encoder);