drm/msm: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()

Plumb the format info from .fb_create() all the way to
drm_helper_mode_fill_fb_struct() to avoid the redundant
lookups.

For the fbdev case a manual drm_get_format_info() lookup
is needed.

Cc: Rob Clark <robdclark@gmail.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <lumag@kernel.org>
Cc: Sean Paul <sean@poorly.run>
Cc: Marijn Suijten <marijn.suijten@somainline.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250701090722.13645-16-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index a82a657169752114b50cb44abd863c53ed0a36d4..1eff615ff9bffed886c441c16c7cfa9d835a8b67 100644 (file)
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -30,6 +30,7 @@ struct msm_framebuffer {
 #define to_msm_framebuffer(x) container_of(x, struct msm_framebuffer, base)
 
 static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
+               const struct drm_format_info *info,
                const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
 
 static int msm_framebuffer_dirtyfb(struct drm_framebuffer *fb,
@@ -154,7 +155,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
                }
        }
 
-       fb = msm_framebuffer_init(dev, mode_cmd, bos);
+       fb = msm_framebuffer_init(dev, info, mode_cmd, bos);
        if (IS_ERR(fb)) {
                ret = PTR_ERR(fb);
                goto out_unref;
@@ -169,11 +170,9 @@ out_unref:
 }
 
 static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
+               const struct drm_format_info *info,
                const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)
 {
-       const struct drm_format_info *info = drm_get_format_info(dev,
-                                                                mode_cmd->pixel_format,
-                                                                mode_cmd->modifier[0]);
        struct msm_drm_private *priv = dev->dev_private;
        struct msm_kms *kms = priv->kms;
        struct msm_framebuffer *msm_fb = NULL;
@@ -227,7 +226,7 @@ static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
                msm_fb->base.obj[i] = bos[i];
        }
 
-       drm_helper_mode_fill_fb_struct(dev, fb, NULL, mode_cmd);
+       drm_helper_mode_fill_fb_struct(dev, fb, info, mode_cmd);
 
        ret = drm_framebuffer_init(dev, fb, &msm_framebuffer_funcs);
        if (ret) {
@@ -276,7 +275,10 @@ msm_alloc_stolen_fb(struct drm_device *dev, int w, int h, int p, uint32_t format
 
        msm_gem_object_set_name(bo, "stolenfb");
 
-       fb = msm_framebuffer_init(dev, &mode_cmd, &bo);
+       fb = msm_framebuffer_init(dev,
+                                 drm_get_format_info(dev, mode_cmd.pixel_format,
+                                                     mode_cmd.modifier[0]),
+                                 &mode_cmd, &bo);
        if (IS_ERR(fb)) {
                DRM_DEV_ERROR(dev->dev, "failed to allocate fb\n");
                /* note: if fb creation failed, we can't rely on fb destroy