drm/i915: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_str...

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

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

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250701090722.13645-14-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 1f5f8c2e9d31501419fbc402d646a81db0a56bdd..0da842bd2f2f13f7106cbb31465125295b49567e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -2207,6 +2207,7 @@ static const struct drm_framebuffer_funcs intel_fb_funcs = {
 
 int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                           struct drm_gem_object *obj,
+                          const struct drm_format_info *info,
                           struct drm_mode_fb_cmd2 *mode_cmd)
 {
        struct intel_display *display = to_intel_display(obj->dev);
@@ -2254,7 +2255,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                goto err_frontbuffer_put;
        }
 
-       drm_helper_mode_fill_fb_struct(display->drm, fb, NULL, mode_cmd);
+       drm_helper_mode_fill_fb_struct(display->drm, fb, info, mode_cmd);
 
        for (i = 0; i < fb->format->num_planes; i++) {
                unsigned int stride_alignment;
@@ -2335,7 +2336,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
        if (IS_ERR(obj))
                return ERR_CAST(obj);
 
-       fb = intel_framebuffer_create(obj, &mode_cmd);
+       fb = intel_framebuffer_create(obj, info, &mode_cmd);
        drm_gem_object_put(obj);
 
        return fb;
@@ -2343,6 +2344,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
 
 struct drm_framebuffer *
 intel_framebuffer_create(struct drm_gem_object *obj,
+                        const struct drm_format_info *info,
                         struct drm_mode_fb_cmd2 *mode_cmd)
 {
        struct intel_framebuffer *intel_fb;
@@ -2352,7 +2354,7 @@ intel_framebuffer_create(struct drm_gem_object *obj,
        if (!intel_fb)
                return ERR_PTR(-ENOMEM);
 
-       ret = intel_framebuffer_init(intel_fb, obj, mode_cmd);
+       ret = intel_framebuffer_init(intel_fb, obj, info, mode_cmd);
        if (ret)
                goto err;
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index 00181c4a67dc8f44b3d54471c87fd9cd11e00182..403b8b63721a909d415ae851e05bd1871386faae 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -102,9 +102,11 @@ void intel_add_fb_offsets(int *x, int *y,
 
 int intel_framebuffer_init(struct intel_framebuffer *ifb,
                           struct drm_gem_object *obj,
+                          const struct drm_format_info *info,
                           struct drm_mode_fb_cmd2 *mode_cmd);
 struct drm_framebuffer *
 intel_framebuffer_create(struct drm_gem_object *obj,
+                        const struct drm_format_info *info,
                         struct drm_mode_fb_cmd2 *mode_cmd);
 struct drm_framebuffer *
 intel_user_framebuffer_create(struct drm_device *dev,

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
index 8db3af36b2f2d06e923f0ac6e4ab2ce36f972e5c..210aee9ae88b88b8d32154dfbaa9ea1e230f7c0e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
@@ -62,7 +62,11 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
                return ERR_PTR(-ENOMEM);
        }
 
-       fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj), &mode_cmd);
+       fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj),
+                                     drm_get_format_info(display->drm,
+                                                         mode_cmd.pixel_format,
+                                                         mode_cmd.modifier[0]),
+                                     &mode_cmd);
        i915_gem_object_put(obj);
 
        return to_intel_framebuffer(fb);

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 2194d39a5c9821eab93ca55dd1b854ca497e6a64..4246173ed3117461880fae8603b088fe1b418316 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -289,7 +289,8 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
        mode_cmd.flags = DRM_MODE_FB_MODIFIERS;
 
        if (intel_framebuffer_init(to_intel_framebuffer(fb),
-                                  intel_bo_to_drm_bo(vma->obj), &mode_cmd)) {
+                                  intel_bo_to_drm_bo(vma->obj),
+                                  fb->format, &mode_cmd)) {
                drm_dbg_kms(display->drm, "intel fb init failed\n");
                goto err_vma;
        }

diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
index b28a94df824fb224b8402661797cc1b92584d51c..fba9617a75a53854133ab0d161e654944fd5c3f3 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
@@ -66,7 +66,11 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
                goto err;
        }
 
-       fb = intel_framebuffer_create(&obj->ttm.base, &mode_cmd);
+       fb = intel_framebuffer_create(&obj->ttm.base,
+                                     drm_get_format_info(dev,
+                                                         mode_cmd.pixel_format,
+                                                         mode_cmd.modifier[0]),
+                                     &mode_cmd);
        if (IS_ERR(fb)) {
                xe_bo_unpin_map_no_vm(obj);
                goto err;

diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index b2ede3af9345c31669791a63844386b4c45783e4..dcbc4b2d3fd9441af532ca1259913d314cdb42f5 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -184,7 +184,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
                return false;
 
        if (intel_framebuffer_init(to_intel_framebuffer(fb),
-                                  &bo->ttm.base, &mode_cmd)) {
+                                  &bo->ttm.base, fb->format, &mode_cmd)) {
                drm_dbg_kms(&xe->drm, "intel fb init failed\n");
                goto err_bo;
        }