Commit b80bfc66 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Move common display enable/disable code to encoder 



All .enable() and .disable() handlers for panels and connectors share
common code that validates and updates the device's state. Move it to
common locations in the omap_encoder_enable() and omap_encoder_disable()
handlers.

The enabled check in the .disable() handler is left untouched, it will
be addressed separately.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent d2c53162

drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

+1 −22
Original line number Diff line number Diff line
@@ -37,40 +37,19 @@ static void tvc_disconnect(struct omap_dss_device *src, 


static int tvc_enable(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *src = dssdev->src;

	int r;



	dev_dbg(ddata->dev, "enable\n");



	if (!omapdss_device_is_connected(dssdev))

		return -ENODEV;



	if (omapdss_device_is_enabled(dssdev))

		return 0;



	r = src->ops->enable(src);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return r;

	return src->ops->enable(src);

}



static void tvc_disable(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *src = dssdev->src;



	dev_dbg(ddata->dev, "disable\n");



	if (!omapdss_device_is_enabled(dssdev))

		return;



	src->ops->disable(src);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static const struct omap_dss_device_ops tvc_ops = {

drivers/gpu/drm/omapdrm/displays/connector-dvi.c

+1 −16
Original line number Diff line number Diff line
@@ -49,21 +49,8 @@ static void dvic_disconnect(struct omap_dss_device *src, 
static int dvic_enable(struct omap_dss_device *dssdev)

{

	struct omap_dss_device *src = dssdev->src;

	int r;



	if (!omapdss_device_is_connected(dssdev))

		return -ENODEV;



	if (omapdss_device_is_enabled(dssdev))

		return 0;



	r = src->ops->enable(src);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

	return src->ops->enable(src);

}



static void dvic_disable(struct omap_dss_device *dssdev)
@@ -74,8 +61,6 @@ static void dvic_disable(struct omap_dss_device *dssdev) 
		return;



	src->ops->disable(src);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int dvic_ddc_read(struct i2c_adapter *adapter,

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+1 −22
Original line number Diff line number Diff line
@@ -43,40 +43,19 @@ static void hdmic_disconnect(struct omap_dss_device *src, 


static int hdmic_enable(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *src = dssdev->src;

	int r;



	dev_dbg(ddata->dev, "enable\n");



	if (!omapdss_device_is_connected(dssdev))

		return -ENODEV;



	if (omapdss_device_is_enabled(dssdev))

		return 0;



	r = src->ops->enable(src);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return r;

	return src->ops->enable(src);

}



static void hdmic_disable(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *src = dssdev->src;



	dev_dbg(ddata->dev, "disable\n");



	if (!omapdss_device_is_enabled(dssdev))

		return;



	src->ops->disable(src);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static bool hdmic_detect(struct omap_dss_device *dssdev)

drivers/gpu/drm/omapdrm/displays/panel-dpi.c

+0 −10
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) 
	struct omap_dss_device *src = dssdev->src;

	int r;



	if (!omapdss_device_is_connected(dssdev))

		return -ENODEV;



	if (omapdss_device_is_enabled(dssdev))

		return 0;



	r = src->ops->enable(src);

	if (r)

		return r;
@@ -70,8 +64,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) 
	gpiod_set_value_cansleep(ddata->enable_gpio, 1);

	backlight_enable(ddata->backlight);



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}
@@ -89,8 +81,6 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev) 
	regulator_disable(ddata->vcc_supply);



	src->ops->disable(src);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static void panel_dpi_get_timings(struct omap_dss_device *dssdev,

drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

+0 −18
Original line number Diff line number Diff line
@@ -793,20 +793,8 @@ static int dsicm_enable(struct omap_dss_device *dssdev) 
	struct omap_dss_device *src = dssdev->src;

	int r;



	dev_dbg(&ddata->pdev->dev, "enable\n");



	mutex_lock(&ddata->lock);



	if (!omapdss_device_is_connected(dssdev)) {

		r = -ENODEV;

		goto err;

	}



	if (omapdss_device_is_enabled(dssdev)) {

		r = 0;

		goto err;

	}



	src->ops->dsi.bus_lock(src);



	r = dsicm_power_on(ddata);
@@ -816,8 +804,6 @@ static int dsicm_enable(struct omap_dss_device *dssdev) 
	if (r)

		goto err;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	mutex_unlock(&ddata->lock);



	dsicm_bl_power(ddata, true);
@@ -835,8 +821,6 @@ static void dsicm_disable(struct omap_dss_device *dssdev) 
	struct omap_dss_device *src = dssdev->src;

	int r;



	dev_dbg(&ddata->pdev->dev, "disable\n");



	dsicm_bl_power(ddata, false);



	mutex_lock(&ddata->lock);
@@ -853,8 +837,6 @@ static void dsicm_disable(struct omap_dss_device *dssdev) 


	src->ops->dsi.bus_unlock(src);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;



	mutex_unlock(&ddata->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE