drm/sysfb: Provide single mode-init helper

Merge the mode-init functions of ofdrm and simpledrm to the new helper
drm_sysfb_mode(). Also implement the DPI defaults there. Replace the
code in each driver with the shared helper.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20250401094056.32904-7-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_helper.c b/drivers/gpu/drm/sysfb/drm_sysfb_helper.c
index c083d21fd9cabaa3616fe7ef6be23b919b750481..6deeac81a41de1e96cc7d4d8fc4c12a3996b6e34 100644 (file)
--- a/drivers/gpu/drm/sysfb/drm_sysfb_helper.c
+++ b/drivers/gpu/drm/sysfb/drm_sysfb_helper.c
@@ -6,3 +6,27 @@
 
 MODULE_DESCRIPTION("Helpers for DRM sysfb drivers");
 MODULE_LICENSE("GPL");
+
+struct drm_display_mode drm_sysfb_mode(unsigned int width,
+                                      unsigned int height,
+                                      unsigned int width_mm,
+                                      unsigned int height_mm)
+{
+       /*
+        * Assume a monitor resolution of 96 dpi to
+        * get a somewhat reasonable screen size.
+        */
+       if (!width_mm)
+               width_mm = DRM_MODE_RES_MM(width, 96ul);
+       if (!height_mm)
+               height_mm = DRM_MODE_RES_MM(height, 96ul);
+
+       {
+               const struct drm_display_mode mode = {
+                       DRM_MODE_INIT(60, width, height, width_mm, height_mm)
+               };
+
+               return mode;
+       }
+}
+EXPORT_SYMBOL(drm_sysfb_mode);

diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_helper.h b/drivers/gpu/drm/sysfb/drm_sysfb_helper.h
index 8f05eee7f49e5dd5474c55a5b7c0d56ea3317892..8b4cc4af702b214158c4e15ddd80c4674770c561 100644 (file)
--- a/drivers/gpu/drm/sysfb/drm_sysfb_helper.h
+++ b/drivers/gpu/drm/sysfb/drm_sysfb_helper.h
@@ -11,6 +11,11 @@
 
 struct drm_format_info;
 
+struct drm_display_mode drm_sysfb_mode(unsigned int width,
+                                      unsigned int height,
+                                      unsigned int width_mm,
+                                      unsigned int height_mm);
+
 /*
  * Device
  */

diff --git a/drivers/gpu/drm/sysfb/ofdrm.c b/drivers/gpu/drm/sysfb/ofdrm.c
index d42704facb455fad4d80fde18dcb08f9fc1ab184..7df6901157fb122e367202891463b3a638a12600 100644 (file)
--- a/drivers/gpu/drm/sysfb/ofdrm.c
+++ b/drivers/gpu/drm/sysfb/ofdrm.c
@@ -1070,21 +1070,6 @@ static const struct ofdrm_device_funcs ofdrm_qemu_device_funcs = {
        .cmap_write = ofdrm_qemu_cmap_write,
 };
 
-static struct drm_display_mode ofdrm_mode(unsigned int width, unsigned int height)
-{
-       /*
-        * Assume a monitor resolution of 96 dpi to
-        * get a somewhat reasonable screen size.
-        */
-       const struct drm_display_mode mode = {
-               DRM_MODE_INIT(60, width, height,
-                             DRM_MODE_RES_MM(width, 96ul),
-                             DRM_MODE_RES_MM(height, 96ul))
-       };
-
-       return mode;
-}
-
 static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,
                                                struct platform_device *pdev)
 {
@@ -1251,7 +1236,7 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,
         */
 
        iosys_map_set_vaddr_iomem(&sysfb->fb_addr, screen_base);
-       sysfb->fb_mode = ofdrm_mode(width, height);
+       sysfb->fb_mode = drm_sysfb_mode(width, height, 0, 0);
        sysfb->fb_format = format;
        sysfb->fb_pitch = linebytes;
 

diff --git a/drivers/gpu/drm/sysfb/simpledrm.c b/drivers/gpu/drm/sysfb/simpledrm.c
index f258d8cdb6b687452508aa5070acb5fd41efe6bf..149df6941b6c7aad74d9dc80a42e92a48e66279b 100644 (file)
--- a/drivers/gpu/drm/sysfb/simpledrm.c
+++ b/drivers/gpu/drm/sysfb/simpledrm.c
@@ -756,18 +756,6 @@ static const struct drm_mode_config_funcs simpledrm_mode_config_funcs = {
  * Init / Cleanup
  */
 
-static struct drm_display_mode simpledrm_mode(unsigned int width,
-                                             unsigned int height,
-                                             unsigned int width_mm,
-                                             unsigned int height_mm)
-{
-       const struct drm_display_mode mode = {
-               DRM_MODE_INIT(60, width, height, width_mm, height_mm)
-       };
-
-       return mode;
-}
-
 static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
                                                        struct platform_device *pdev)
 {
@@ -855,16 +843,7 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
                        return ERR_PTR(-EINVAL);
        }
 
-       /*
-        * Assume a monitor resolution of 96 dpi if physical dimensions
-        * are not specified to get a somewhat reasonable screen size.
-        */
-       if (!width_mm)
-               width_mm = DRM_MODE_RES_MM(width, 96ul);
-       if (!height_mm)
-               height_mm = DRM_MODE_RES_MM(height, 96ul);
-
-       sysfb->fb_mode = simpledrm_mode(width, height, width_mm, height_mm);
+       sysfb->fb_mode = drm_sysfb_mode(width, height, width_mm, height_mm);
        sysfb->fb_format = format;
        sysfb->fb_pitch = stride;