From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 3/9] drm/{i915, xe}/fbdev: deduplicate struct drm_mode_fb_cmd2 init
Date: Wed, 3 Sep 2025 23:32:00 +0300 [thread overview]
Message-ID: <c4e4db130391ba8458dfe0cdfc4fa0238d917e20.1756931441.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1756931441.git.jani.nikula@intel.com>
Pull struct drm_mode_fb_cmd2 initialization out of the driver dependent
code into shared display code.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_fbdev.c | 32 ++++++++++++++++++-
drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 24 ++++----------
drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 4 +--
drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 24 ++++----------
4 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 46c6de5f6088..5ac66fb88fcf 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] = intel_fbdev_fb_pitch_align(mode_cmd->width * DIV_ROUND_UP(sizes->surface_bpp, 8));
+ 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 d1c03d7b9bdc..4710859718a0 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"
@@ -19,27 +19,15 @@ u32 intel_fbdev_fb_pitch_align(u32 stride)
}
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] = intel_fbdev_fb_pitch_align(mode_cmd.width * DIV_ROUND_UP(sizes->surface_bpp, 8));
- 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);
@@ -68,9 +56,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);
i915_gem_object_put(obj);
return to_intel_framebuffer(fb);
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
index caeb543d5efc..11c2d4b54ab0 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
@@ -9,15 +9,15 @@
#include <linux/types.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;
u32 intel_fbdev_fb_pitch_align(u32 stride);
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 fd2c40020eea..8e2f338d36fa 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"
@@ -21,26 +21,14 @@ u32 intel_fbdev_fb_pitch_align(u32 stride)
}
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] = intel_fbdev_fb_pitch_align(mode_cmd.width * DIV_ROUND_UP(sizes->surface_bpp, 8));
- 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);
@@ -71,9 +59,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.2
next prev parent reply other threads:[~2025-09-03 20:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-03 20:31 [PATCH 0/9] drm/{i915,xe}/fbdev: refactor Jani Nikula
2025-09-03 20:31 ` [PATCH 1/9] drm/{i915, xe}/fbdev: pass struct drm_device to intel_fbdev_fb_alloc() Jani Nikula
2025-09-03 20:31 ` [PATCH 2/9] drm/{i915,xe}/fbdev: add intel_fbdev_fb_pitch_align() Jani Nikula
2025-09-05 9:23 ` [PATCH 2/9] drm/{i915, xe}/fbdev: " Ville Syrjälä
2025-09-08 12:55 ` Jani Nikula
2025-09-08 14:19 ` Lucas De Marchi
2025-09-08 16:10 ` Maarten Lankhorst
2025-09-08 16:27 ` Ville Syrjälä
2025-09-16 11:44 ` Jani Nikula
2025-09-16 19:19 ` Ville Syrjälä
2025-09-18 8:43 ` Jani Nikula
2025-10-13 13:52 ` Jani Nikula
2025-10-13 17:19 ` Ville Syrjälä
2025-10-14 4:48 ` Hogander, Jouni
2025-09-03 20:32 ` Jani Nikula [this message]
2025-09-03 20:32 ` [PATCH 4/9] drm/i915/fbdev: abstract bo creation Jani Nikula
2025-09-03 20:32 ` [PATCH 5/9] drm/xe/fbdev: " Jani Nikula
2025-09-03 20:32 ` [PATCH 6/9] drm/{i915,xe}/fbdev: add intel_fbdev_fb_bo_destroy() Jani Nikula
2025-09-04 14:37 ` Ville Syrjälä
2025-09-08 13:01 ` Jani Nikula
2025-09-17 12:33 ` Jani Nikula
2025-09-17 14:07 ` Ville Syrjälä
2025-09-18 8:46 ` Jani Nikula
2025-09-03 20:32 ` [PATCH 7/9] drm/{i915,xe}/fbdev: deduplicate fbdev creation Jani Nikula
2025-09-04 14:39 ` Ville Syrjälä
2025-09-08 12:57 ` Jani Nikula
2025-09-03 20:32 ` [PATCH 8/9] drm/{i915, xe}/fbdev: pass struct drm_device to intel_fbdev_fb_fill_info() Jani Nikula
2025-09-03 20:32 ` [PATCH 9/9] drm/i915/fbdev: drop dependency on display in i915 specific code Jani Nikula
2025-09-03 21:15 ` ✓ i915.CI.BAT: success for drm/{i915,xe}/fbdev: refactor Patchwork
2025-09-05 1:09 ` ✗ i915.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4e4db130391ba8458dfe0cdfc4fa0238d917e20.1756931441.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox