On Thu, Sep 18, 2025 at 11:40:54AM +0300, Jani Nikula wrote:
> Pull struct drm_mode_fb_cmd2 initialization out of the driver dependent
> code into shared display code.
>
> v2: Rebase on xe stride alignment change
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fbdev.c | 32 ++++++++++++++++++-
> drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 25 ++++-----------
> drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 4 +--
> drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 25 ++++-----------
> 4 files changed, 45 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c
> b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 46c6de5f6088..e46c08762b84 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -207,6 +207,35 @@ static const struct drm_fb_helper_funcs
> intel_fb_helper_funcs = {
> .fb_set_suspend = intelfb_set_suspend,
> };
>
> +static void intel_fbdev_fill_mode_cmd(struct drm_fb_helper_surface_size
> *sizes,
> + struct drm_mode_fb_cmd2 *mode_cmd)
> +{
> + /* we don't do packed 24bpp */
> + if (sizes->surface_bpp == 24)
> + sizes->surface_bpp = 32;
> +
> + mode_cmd->width = sizes->surface_width;
> + mode_cmd->height = sizes->surface_height;
> +
> + mode_cmd->pitches[0] = ALIGN(mode_cmd->width *
> DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
> + mode_cmd->pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
> +
> sizes->surface_depth);
> +}
> +
> +static struct intel_framebuffer *
> +__intel_fbdev_fb_alloc(struct intel_display *display,
> + struct drm_fb_helper_surface_size *sizes)
> +{
> + struct drm_mode_fb_cmd2 mode_cmd = {};
> + struct intel_framebuffer *fb;
> +
> + intel_fbdev_fill_mode_cmd(sizes, &mode_cmd);
> +
> + fb = intel_fbdev_fb_alloc(display->drm, &mode_cmd);
> +
> + return fb;
> +}
> +
> int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
> struct drm_fb_helper_surface_size *sizes)
> {
> @@ -237,7 +266,8 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper
> *helper,
> if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) {
> drm_dbg_kms(display->drm,
> "no BIOS fb, allocating a new one\n");
> - fb = intel_fbdev_fb_alloc(display->drm, sizes);
> +
> + fb = __intel_fbdev_fb_alloc(display, sizes);
> if (IS_ERR(fb))
> return PTR_ERR(fb);
> } else {
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> index 4de13d1a4c7a..685612e6afc5 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> @@ -3,7 +3,7 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#include <drm/drm_fb_helper.h>
> +#include <linux/fb.h>
>
> #include "gem/i915_gem_lmem.h"
>
> @@ -14,28 +14,15 @@
> #include "intel_fbdev_fb.h"
>
> struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
> - struct
> drm_fb_helper_surface_size *sizes)
> + struct drm_mode_fb_cmd2
> *mode_cmd)
> {
> struct intel_display *display = to_intel_display(drm);
> struct drm_i915_private *dev_priv = to_i915(drm);
> struct drm_framebuffer *fb;
> - struct drm_mode_fb_cmd2 mode_cmd = {};
> struct drm_i915_gem_object *obj;
> int size;
>
> - /* we don't do packed 24bpp */
> - if (sizes->surface_bpp == 24)
> - sizes->surface_bpp = 32;
> -
> - mode_cmd.width = sizes->surface_width;
> - mode_cmd.height = sizes->surface_height;
> -
> - mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
> - DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
> - mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
> - sizes->surface_depth);
> -
> - size = mode_cmd.pitches[0] * mode_cmd.height;
> + size = mode_cmd->pitches[0] * mode_cmd->height;
> size = PAGE_ALIGN(size);
>
> obj = ERR_PTR(-ENODEV);
> @@ -64,9 +51,9 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct
> drm_device *drm,
>
> fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj),
> drm_get_format_info(drm,
> - mode_cmd.pixel_format,
> - mode_cmd.modifier[0]),
> - &mode_cmd);
> +
> mode_cmd->pixel_format,
> +
> mode_cmd->modifier[0]),
> + mode_cmd);
> if (IS_ERR(fb)) {
> i915_gem_object_put(obj);
> goto err;
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> index 668ae355f5e5..83454ffbf79c 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> @@ -7,14 +7,14 @@
> #define __INTEL_FBDEV_FB_H__
>
> struct drm_device;
> -struct drm_fb_helper_surface_size;
> struct drm_gem_object;
> +struct drm_mode_fb_cmd2;
> struct fb_info;
> struct i915_vma;
> struct intel_display;
>
> struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
> - struct
> drm_fb_helper_surface_size *sizes);
> + struct drm_mode_fb_cmd2
> *mode_cmd);
> int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info
> *info,
> struct drm_gem_object *obj, struct i915_vma *vma);
>
> diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> index 5c0874bfa6ab..8eaf1cc7fdf9 100644
> --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> +++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> @@ -3,7 +3,7 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#include <drm/drm_fb_helper.h>
> +#include <linux/fb.h>
>
> #include "intel_display_core.h"
> #include "intel_display_types.h"
> @@ -16,27 +16,14 @@
> #include <generated/xe_wa_oob.h>
>
> struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
> - struct
> drm_fb_helper_surface_size *sizes)
> + struct drm_mode_fb_cmd2
> *mode_cmd)
> {
> struct drm_framebuffer *fb;
> struct xe_device *xe = to_xe_device(drm);
> - struct drm_mode_fb_cmd2 mode_cmd = {};
> struct xe_bo *obj;
> int size;
>
> - /* we don't do packed 24bpp */
> - if (sizes->surface_bpp == 24)
> - sizes->surface_bpp = 32;
> -
> - mode_cmd.width = sizes->surface_width;
> - mode_cmd.height = sizes->surface_height;
> -
> - mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
> - DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
> - mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
> - sizes->surface_depth);
> -
> - size = mode_cmd.pitches[0] * mode_cmd.height;
> + size = mode_cmd->pitches[0] * mode_cmd->height;
> size = PAGE_ALIGN(size);
> obj = ERR_PTR(-ENODEV);
>
> @@ -67,9 +54,9 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct
> drm_device *drm,
>
> fb = intel_framebuffer_create(&obj->ttm.base,
> drm_get_format_info(drm,
> - mode_cmd.pixel_format,
> - mode_cmd.modifier[0]),
> - &mode_cmd);
> +
> mode_cmd->pixel_format,
> +
> mode_cmd->modifier[0]),
> + mode_cmd);
> if (IS_ERR(fb)) {
> xe_bo_unpin_map_no_vm(obj);
> goto err;
> --
> 2.47.3
--
Ville Syrjälä
Intel
