Commit 01e48e52 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/sysfb: Merge connector functions 



Merge the connector functions of ofdrm and simpledrm. Replace the
code in each driver with the shared helpers. Set up callbacks with
initializer macros.

No effective code changes. The sysfb connector only returns the
preconfigured display mode.

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-9-tzimmermann@suse.de
parent 559d105f

drivers/gpu/drm/sysfb/drm_sysfb_helper.c

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


#include <linux/module.h>



#include <drm/drm_probe_helper.h>



#include "drm_sysfb_helper.h"



MODULE_DESCRIPTION("Helpers for DRM sysfb drivers");
@@ -30,3 +32,15 @@ struct drm_display_mode drm_sysfb_mode(unsigned int width, 
	}

}

EXPORT_SYMBOL(drm_sysfb_mode);



/*

 * Connector

 */



int drm_sysfb_connector_helper_get_modes(struct drm_connector *connector)

{

	struct drm_sysfb_device *sysfb = to_drm_sysfb_device(connector->dev);



	return drm_connector_helper_get_modes_fixed(connector, &sysfb->fb_mode);

}

EXPORT_SYMBOL(drm_sysfb_connector_helper_get_modes);

drivers/gpu/drm/sysfb/drm_sysfb_helper.h

+15 −0
Original line number Diff line number Diff line
@@ -37,6 +37,21 @@ static inline struct drm_sysfb_device *to_drm_sysfb_device(struct drm_device *de 
	return container_of(dev, struct drm_sysfb_device, dev);

}



/*

 * Connector

 */



int drm_sysfb_connector_helper_get_modes(struct drm_connector *connector);



#define DRM_SYSFB_CONNECTOR_HELPER_FUNCS \

	.get_modes = drm_sysfb_connector_helper_get_modes



#define DRM_SYSFB_CONNECTOR_FUNCS \

	.reset = drm_atomic_helper_connector_reset, \

	.fill_modes = drm_helper_probe_single_connector_modes, \

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state



/*

 * Mode config

 */

drivers/gpu/drm/sysfb/ofdrm.c

+2 −12
Original line number Diff line number Diff line
@@ -998,23 +998,13 @@ static const struct drm_encoder_funcs ofdrm_encoder_funcs = { 
	.destroy = drm_encoder_cleanup,

};



static int ofdrm_connector_helper_get_modes(struct drm_connector *connector)

{

	struct drm_sysfb_device *sysfb = to_drm_sysfb_device(connector->dev);



	return drm_connector_helper_get_modes_fixed(connector, &sysfb->fb_mode);

}



static const struct drm_connector_helper_funcs ofdrm_connector_helper_funcs = {

	.get_modes = ofdrm_connector_helper_get_modes,

	DRM_SYSFB_CONNECTOR_HELPER_FUNCS,

};



static const struct drm_connector_funcs ofdrm_connector_funcs = {

	.reset = drm_atomic_helper_connector_reset,

	.fill_modes = drm_helper_probe_single_connector_modes,

	DRM_SYSFB_CONNECTOR_FUNCS,

	.destroy = drm_connector_cleanup,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static const struct drm_mode_config_funcs ofdrm_mode_config_funcs = {

drivers/gpu/drm/sysfb/simpledrm.c

+2 −12
Original line number Diff line number Diff line
@@ -727,23 +727,13 @@ static const struct drm_encoder_funcs simpledrm_encoder_funcs = { 
	.destroy = drm_encoder_cleanup,

};



static int simpledrm_connector_helper_get_modes(struct drm_connector *connector)

{

	struct drm_sysfb_device *sysfb = to_drm_sysfb_device(connector->dev);



	return drm_connector_helper_get_modes_fixed(connector, &sysfb->fb_mode);

}



static const struct drm_connector_helper_funcs simpledrm_connector_helper_funcs = {

	.get_modes = simpledrm_connector_helper_get_modes,

	DRM_SYSFB_CONNECTOR_HELPER_FUNCS,

};



static const struct drm_connector_funcs simpledrm_connector_funcs = {

	.reset = drm_atomic_helper_connector_reset,

	.fill_modes = drm_helper_probe_single_connector_modes,

	DRM_SYSFB_CONNECTOR_FUNCS,

	.destroy = drm_connector_cleanup,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static const struct drm_mode_config_funcs simpledrm_mode_config_funcs = {