Commit 333376e9 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20250401094056.32904-7-tzimmermann@suse.de
parent b5626f6f

drivers/gpu/drm/sysfb/drm_sysfb_helper.c

+24 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/sysfb/drm_sysfb_helper.h

+5 −0
Original line number Diff line number Diff line
@@ -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

 */

drivers/gpu/drm/sysfb/ofdrm.c

+1 −16
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/sysfb/simpledrm.c

+1 −22
Original line number Diff line number Diff line
@@ -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;