Commit 3d0dad86 authored by Miquel Raynal's avatar Miquel Raynal Committed by Heiko Stuebner
Browse files

drm/rockchip: lvds: move hardware-specific functions together 



Reorganize a bit the functions order to clarify the driver and separate
hardware independent and specific functions a bit. This change only moves
functions around, there is no functional change.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
[adapted to recent drm_panel_get_modes() param change ]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20191224143900.23567-9-miquel.raynal@bootlin.com
parent 2258d53a

drivers/gpu/drm/rockchip/rockchip_lvds.c

+45 −45
Original line number Diff line number Diff line
@@ -98,6 +98,40 @@ static inline int rockchip_lvds_name_to_output(const char *s) 
	return -EINVAL;

}



static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static int rockchip_lvds_connector_get_modes(struct drm_connector *connector)

{

	struct rockchip_lvds *lvds = connector_to_lvds(connector);

	struct drm_panel *panel = lvds->panel;



	return drm_panel_get_modes(panel, connector);

}



static const

struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {

	.get_modes = rockchip_lvds_connector_get_modes,

};



static int

rockchip_lvds_encoder_atomic_check(struct drm_encoder *encoder,

				   struct drm_crtc_state *crtc_state,

				   struct drm_connector_state *conn_state)

{

	struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);



	s->output_mode = ROCKCHIP_OUT_MODE_P888;

	s->output_type = DRM_MODE_CONNECTOR_LVDS;



	return 0;

}



static int rk3288_lvds_poweron(struct rockchip_lvds *lvds)

{

	int ret;
@@ -194,27 +228,6 @@ static void rk3288_lvds_poweroff(struct rockchip_lvds *lvds) 
	clk_disable(lvds->pclk);

}



static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static int rockchip_lvds_connector_get_modes(struct drm_connector *connector)

{

	struct rockchip_lvds *lvds = connector_to_lvds(connector);

	struct drm_panel *panel = lvds->panel;



	return drm_panel_get_modes(panel, connector);

}



static const

struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {

	.get_modes = rockchip_lvds_connector_get_modes,

};



static int rk3288_lvds_grf_config(struct drm_encoder *encoder,

				  struct drm_display_mode *mode)

{
@@ -268,19 +281,6 @@ static int rk3288_lvds_set_vop_source(struct rockchip_lvds *lvds, 
	return 0;

}



static int

rockchip_lvds_encoder_atomic_check(struct drm_encoder *encoder,

				   struct drm_crtc_state *crtc_state,

				   struct drm_connector_state *conn_state)

{

	struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);



	s->output_mode = ROCKCHIP_OUT_MODE_P888;

	s->output_type = DRM_MODE_CONNECTOR_LVDS;



	return 0;

}



static void rk3288_lvds_encoder_enable(struct drm_encoder *encoder)

{

	struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
@@ -322,6 +322,17 @@ static void rk3288_lvds_encoder_disable(struct drm_encoder *encoder) 
	drm_panel_unprepare(lvds->panel);

}



static const

struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = {

	.enable = rk3288_lvds_encoder_enable,

	.disable = rk3288_lvds_encoder_disable,

	.atomic_check = rockchip_lvds_encoder_atomic_check,

};



static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int rk3288_lvds_probe(struct platform_device *pdev,

			     struct rockchip_lvds *lvds)

{
@@ -368,17 +379,6 @@ static int rk3288_lvds_probe(struct platform_device *pdev, 
	return 0;

}



static const

struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = {

	.enable = rk3288_lvds_encoder_enable,

	.disable = rk3288_lvds_encoder_disable,

	.atomic_check = rockchip_lvds_encoder_atomic_check,

};



static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static const struct rockchip_lvds_soc_data rk3288_lvds_data = {

	.probe = rk3288_lvds_probe,

	.helper_funcs = &rk3288_lvds_encoder_helper_funcs,