Commit 650e7881 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: lvds: Move LVDS enable code to separate code section 



To prepare for a rework of the LVDS disable code, which will need to be
called from rcar_lvds_pclk_disable(), move the LVDS enable code,
currently stored in the __rcar_lvds_atomic_enable() function, to a
separate code section separate from bridge operations. It will be then
extended with the LVDS disable code.

As part of this rework the __rcar_lvds_atomic_enable() function is
renamed to rcar_lvds_enable() to more clearly indicate its purpose.

No functional change intended.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
parent c95e2ad9

drivers/gpu/drm/rcar-du/rcar_lvds.c

+50 −47
Original line number Diff line number Diff line
@@ -311,46 +311,7 @@ static void rcar_lvds_pll_setup_d3_e3(struct rcar_lvds *lvds, unsigned int freq) 
}



/* -----------------------------------------------------------------------------

 * Clock - D3/E3 only

 */



int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)

{

	struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);

	int ret;



	if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))

		return -ENODEV;



	dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);



	ret = pm_runtime_resume_and_get(lvds->dev);

	if (ret)

		return ret;



	__rcar_lvds_pll_setup_d3_e3(lvds, freq, true);



	return 0;

}

EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);



void rcar_lvds_pclk_disable(struct drm_bridge *bridge)

{

	struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);



	if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))

		return;



	dev_dbg(lvds->dev, "disabling LVDS PLL\n");



	rcar_lvds_write(lvds, LVDPLLCR, 0);



	pm_runtime_put_sync(lvds->dev);

}

EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);



/* -----------------------------------------------------------------------------

 * Bridge

 * Enable/disable

 */



static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds,
@@ -394,7 +355,7 @@ static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds, 
	return mode;

}



static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,

static void rcar_lvds_enable(struct drm_bridge *bridge,

			     struct drm_atomic_state *state,

			     struct drm_crtc *crtc,

			     struct drm_connector *connector)
@@ -410,8 +371,7 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge, 


	/* Enable the companion LVDS encoder in dual-link mode. */

	if (lvds->link_type != RCAR_LVDS_SINGLE_LINK && lvds->companion)

		__rcar_lvds_atomic_enable(lvds->companion, state, crtc,

					  connector);

		rcar_lvds_enable(lvds->companion, state, crtc, connector);



	/*

	 * Hardcode the channels and control signals routing for now.
@@ -531,6 +491,49 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge, 
	rcar_lvds_write(lvds, LVDCR0, lvdcr0);

}



/* -----------------------------------------------------------------------------

 * Clock - D3/E3 only

 */



int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)

{

	struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);

	int ret;



	if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))

		return -ENODEV;



	dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);



	ret = pm_runtime_resume_and_get(lvds->dev);

	if (ret)

		return ret;



	__rcar_lvds_pll_setup_d3_e3(lvds, freq, true);



	return 0;

}

EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);



void rcar_lvds_pclk_disable(struct drm_bridge *bridge)

{

	struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);



	if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))

		return;



	dev_dbg(lvds->dev, "disabling LVDS PLL\n");



	rcar_lvds_write(lvds, LVDPLLCR, 0);



	pm_runtime_put_sync(lvds->dev);

}

EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);



/* -----------------------------------------------------------------------------

 * Bridge

 */



static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,

				    struct drm_bridge_state *old_bridge_state)

{
@@ -542,7 +545,7 @@ static void rcar_lvds_atomic_enable(struct drm_bridge *bridge, 
							     bridge->encoder);

	crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;



	__rcar_lvds_atomic_enable(bridge, state, crtc, connector);

	rcar_lvds_enable(bridge, state, crtc, connector);

}



static void rcar_lvds_atomic_disable(struct drm_bridge *bridge,