Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/omap: Factor out common init/cleanup code for output devices 



All the internal encoders share common init and cleanup code. Factor it
out to separate functions.

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 56c9818d

drivers/gpu/drm/omapdrm/dss/dpi.c

+3 −14
Original line number Diff line number Diff line
@@ -641,19 +641,9 @@ static int dpi_init_output_port(struct dpi_data *dpi, struct device_node *port) 
	out->ops = &dpi_ops;

	out->owner = THIS_MODULE;



	out->next = omapdss_of_find_connected_device(out->dev->of_node, 0);

	if (IS_ERR(out->next)) {

		if (PTR_ERR(out->next) != -EPROBE_DEFER)

			dev_err(out->dev, "failed to find video sink\n");

		return PTR_ERR(out->next);

	}



	r = omapdss_output_validate(out);

	if (r) {

		omapdss_device_put(out->next);

		out->next = NULL;

	r = omapdss_device_init_output(out);

	if (r < 0)

		return r;

	}



	omapdss_device_register(out);
@@ -665,9 +655,8 @@ static void dpi_uninit_output_port(struct device_node *port) 
	struct dpi_data *dpi = port->data;

	struct omap_dss_device *out = &dpi->output;



	if (out->next)

		omapdss_device_put(out->next);

	omapdss_device_unregister(out);

	omapdss_device_cleanup_output(out);

}



static const struct soc_device_attribute dpi_soc_devices[] = {

drivers/gpu/drm/omapdrm/dss/dsi.c

+3 −14
Original line number Diff line number Diff line
@@ -5131,19 +5131,9 @@ static int dsi_init_output(struct dsi_data *dsi) 
		       | DRM_BUS_FLAG_DE_HIGH

		       | DRM_BUS_FLAG_SYNC_NEGEDGE;



	out->next = omapdss_of_find_connected_device(out->dev->of_node, 0);

	if (IS_ERR(out->next)) {

		if (PTR_ERR(out->next) != -EPROBE_DEFER)

			dev_err(out->dev, "failed to find video sink\n");

		return PTR_ERR(out->next);

	}



	r = omapdss_output_validate(out);

	if (r) {

		omapdss_device_put(out->next);

		out->next = NULL;

	r = omapdss_device_init_output(out);

	if (r < 0)

		return r;

	}



	omapdss_device_register(out);
@@ -5154,9 +5144,8 @@ static void dsi_uninit_output(struct dsi_data *dsi) 
{

	struct omap_dss_device *out = &dsi->output;



	if (out->next)

		omapdss_device_put(out->next);

	omapdss_device_unregister(out);

	omapdss_device_cleanup_output(out);

}



static int dsi_probe_of(struct dsi_data *dsi)

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+3 −14
Original line number Diff line number Diff line
@@ -687,19 +687,9 @@ static int hdmi4_init_output(struct omap_hdmi *hdmi) 
	out->of_ports = BIT(0);

	out->ops_flags = OMAP_DSS_DEVICE_OP_EDID;



	out->next = omapdss_of_find_connected_device(out->dev->of_node, 0);

	if (IS_ERR(out->next)) {

		if (PTR_ERR(out->next) != -EPROBE_DEFER)

			dev_err(out->dev, "failed to find video sink\n");

		return PTR_ERR(out->next);

	}



	r = omapdss_output_validate(out);

	if (r) {

		omapdss_device_put(out->next);

		out->next = NULL;

	r = omapdss_device_init_output(out);

	if (r < 0)

		return r;

	}



	omapdss_device_register(out);
@@ -710,9 +700,8 @@ static void hdmi4_uninit_output(struct omap_hdmi *hdmi) 
{

	struct omap_dss_device *out = &hdmi->output;



	if (out->next)

		omapdss_device_put(out->next);

	omapdss_device_unregister(out);

	omapdss_device_cleanup_output(out);

}



static int hdmi4_probe_of(struct omap_hdmi *hdmi)

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+3 −14
Original line number Diff line number Diff line
@@ -671,19 +671,9 @@ static int hdmi5_init_output(struct omap_hdmi *hdmi) 
	out->of_ports = BIT(0);

	out->ops_flags = OMAP_DSS_DEVICE_OP_EDID;



	out->next = omapdss_of_find_connected_device(out->dev->of_node, 0);

	if (IS_ERR(out->next)) {

		if (PTR_ERR(out->next) != -EPROBE_DEFER)

			dev_err(out->dev, "failed to find video sink\n");

		return PTR_ERR(out->next);

	}



	r = omapdss_output_validate(out);

	if (r) {

		omapdss_device_put(out->next);

		out->next = NULL;

	r = omapdss_device_init_output(out);

	if (r < 0)

		return r;

	}



	omapdss_device_register(out);
@@ -694,9 +684,8 @@ static void hdmi5_uninit_output(struct omap_hdmi *hdmi) 
{

	struct omap_dss_device *out = &hdmi->output;



	if (out->next)

		omapdss_device_put(out->next);

	omapdss_device_unregister(out);

	omapdss_device_cleanup_output(out);

}



static int hdmi5_probe_of(struct omap_hdmi *hdmi)

drivers/gpu/drm/omapdrm/dss/omapdss.h

+2 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ int omap_dss_get_num_overlays(void); 
#define for_each_dss_output(d) \

	while ((d = omapdss_device_next_output(d)) != NULL)

struct omap_dss_device *omapdss_device_next_output(struct omap_dss_device *from);

int omapdss_output_validate(struct omap_dss_device *out);

int omapdss_device_init_output(struct omap_dss_device *out);

void omapdss_device_cleanup_output(struct omap_dss_device *out);



typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);

int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);