Commit 1521653c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: register only one display device per output 



We have boards with multiple panel devices connected to the same
physical output, of which only one panel can be enabled at one time.
Examples of these are Overo, where you can use different daughter boards
that have different LCDs, and 3430SDP which has an LCD and a DVI output
and a physical switch to select the active display.

These are supported by omapdss so that we add all the possible display
devices at probe, but the displays are inactive until somebody enables
one. At this point the panel driver starts using the DSS, thus reserving
the physcal resource and excluding the other panels.

This is problematic:
- Panel drivers can't allocate their resources properly at probe(),
  because the resources can be shared with other panels. Thus they can
  be only reserved at enable time.
- Managing this in omapdss is confusing. It's not natural to have
  child devices, which may not even exist (for example, a daughterboard
  that is not connected).

Only some boards have multiple displays per output, and of those, only
very few have possibility of switching the display during runtime.
Because of the above points:
- We don't want to make omapdss and all the panel drivers more complex
  just because some boards have complex setups.
- Only few boards support runtime switching, and afaik even then it's
  not required. So we don't need to support runtime switching.

Thus we'll change to a model where we will have only one display device
per output and this cannot be (currently) changed at runtime. We'll
still have the possibility to select the display from multiple options
during boot with the default display option.

This patch accomplishes the above by changing how the output drivers
register the display device. Instead of registering all the devices
given from the board file, we'll only register one. If the default
display option is set, the output driver selects that display from its
displays. If the default display is not set, or the default display is
not one of the output's displays, the output driver selects the first
display.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 6a03fca9

drivers/video/omap2/dss/dpi.c

+37 −10
Original line number Diff line number Diff line
@@ -371,10 +371,14 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev) 
	return 0;

}



static void __init dpi_probe_pdata(struct platform_device *pdev)

static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	int i, r;

	const char *def_disp_name = dss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;



	def_dssdev = NULL;



	for (i = 0; i < pdata->num_devices; ++i) {

		struct omap_dss_device *dssdev = pdata->devices[i];
@@ -382,16 +386,39 @@ static void __init dpi_probe_pdata(struct platform_device *pdev) 
		if (dssdev->type != OMAP_DISPLAY_TYPE_DPI)

			continue;



		if (def_dssdev == NULL)

			def_dssdev = dssdev;



		if (def_disp_name != NULL &&

				strcmp(dssdev->name, def_disp_name) == 0) {

			def_dssdev = dssdev;

			break;

		}

	}



	return def_dssdev;

}



static void __init dpi_probe_pdata(struct platform_device *pdev)

{

	struct omap_dss_device *dssdev;

	int r;



	dssdev = dpi_find_dssdev(pdev);



	if (!dssdev)

		return;



	r = dpi_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		return;

	}



	r = omap_dss_register_device(dssdev, &pdev->dev);

		if (r)

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

	if (r) {

		DSSERR("device %s register failed: %d\n", dssdev->name, r);

		return;

	}

}

drivers/video/omap2/dss/dsi.c

+39 −12
Original line number Diff line number Diff line
@@ -5006,11 +5006,15 @@ static void dsi_put_clocks(struct platform_device *dsidev) 
		clk_put(dsi->sys_clk);

}



static void __init dsi_probe_pdata(struct platform_device *dsidev)

static struct omap_dss_device * __init dsi_find_dssdev(struct platform_device *pdev)

{

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct omap_dss_board_info *pdata = dsidev->dev.platform_data;

	int i, r;

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	struct dsi_data *dsi = dsi_get_dsidrv_data(pdev);

	const char *def_disp_name = dss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;



	def_dssdev = NULL;



	for (i = 0; i < pdata->num_devices; ++i) {

		struct omap_dss_device *dssdev = pdata->devices[i];
@@ -5021,16 +5025,39 @@ static void __init dsi_probe_pdata(struct platform_device *dsidev) 
		if (dssdev->phy.dsi.module != dsi->module_id)

			continue;



		if (def_dssdev == NULL)

			def_dssdev = dssdev;



		if (def_disp_name != NULL &&

				strcmp(dssdev->name, def_disp_name) == 0) {

			def_dssdev = dssdev;

			break;

		}

	}



	return def_dssdev;

}



static void __init dsi_probe_pdata(struct platform_device *dsidev)

{

	struct omap_dss_device *dssdev;

	int r;



	dssdev = dsi_find_dssdev(dsidev);



	if (!dssdev)

		return;



	r = dsi_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		return;

	}



	r = omap_dss_register_device(dssdev, &dsidev->dev);

		if (r)

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

	if (r) {

		DSSERR("device %s register failed: %d\n", dssdev->name, r);

		return;

	}

}

drivers/video/omap2/dss/dss.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct seq_file; 
struct platform_device;



/* core */

const char *dss_get_default_display_name(void);

struct bus_type *dss_get_bus(void);

struct regulator *dss_get_vdds_dsi(void);

struct regulator *dss_get_vdds_sdi(void);

drivers/video/omap2/dss/hdmi.c

+43 −14
Original line number Diff line number Diff line
@@ -901,18 +901,47 @@ int hdmi_audio_config(struct omap_dss_audio *audio) 


#endif



static void __init hdmi_probe_pdata(struct platform_device *pdev)

static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	int r, i;

	const char *def_disp_name = dss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;



	def_dssdev = NULL;



	for (i = 0; i < pdata->num_devices; ++i) {

		struct omap_dss_device *dssdev = pdata->devices[i];

		struct omap_dss_hdmi_data *priv = dssdev->data;



		if (dssdev->type != OMAP_DISPLAY_TYPE_HDMI)

			continue;



		if (def_dssdev == NULL)

			def_dssdev = dssdev;



		if (def_disp_name != NULL &&

				strcmp(dssdev->name, def_disp_name) == 0) {

			def_dssdev = dssdev;

			break;

		}

	}



	return def_dssdev;

}



static void __init hdmi_probe_pdata(struct platform_device *pdev)

{

	struct omap_dss_device *dssdev;

	struct omap_dss_hdmi_data *priv;

	int r;



	dssdev = hdmi_find_dssdev(pdev);



	if (!dssdev)

		return;



	priv = dssdev->data;



	hdmi.ct_cp_hpd_gpio = priv->ct_cp_hpd_gpio;

	hdmi.ls_oe_gpio = priv->ls_oe_gpio;

	hdmi.hpd_gpio = priv->hpd_gpio;
@@ -920,13 +949,13 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) 
	r = hdmi_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		return;

	}



	r = omap_dss_register_device(dssdev, &pdev->dev);

		if (r)

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

	if (r) {

		DSSERR("device %s register failed: %d\n", dssdev->name, r);

		return;

	}

}

drivers/video/omap2/dss/rfbi.c

+37 −10
Original line number Diff line number Diff line
@@ -942,10 +942,14 @@ static int __init rfbi_init_display(struct omap_dss_device *dssdev) 
	return 0;

}



static void __init rfbi_probe_pdata(struct platform_device *pdev)

static struct omap_dss_device * __init rfbi_find_dssdev(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	int i, r;

	const char *def_disp_name = dss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;



	def_dssdev = NULL;



	for (i = 0; i < pdata->num_devices; ++i) {

		struct omap_dss_device *dssdev = pdata->devices[i];
@@ -953,16 +957,39 @@ static void __init rfbi_probe_pdata(struct platform_device *pdev) 
		if (dssdev->type != OMAP_DISPLAY_TYPE_DBI)

			continue;



		if (def_dssdev == NULL)

			def_dssdev = dssdev;



		if (def_disp_name != NULL &&

				strcmp(dssdev->name, def_disp_name) == 0) {

			def_dssdev = dssdev;

			break;

		}

	}



	return def_dssdev;

}



static void __init rfbi_probe_pdata(struct platform_device *pdev)

{

	struct omap_dss_device *dssdev;

	int r;



	dssdev = rfbi_find_dssdev(pdev);



	if (!dssdev)

		return;



	r = rfbi_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		return;

	}



	r = omap_dss_register_device(dssdev, &pdev->dev);

		if (r)

			DSSERR("device %s register failed: %d\n",

				dssdev->name, r);

	if (r) {

		DSSERR("device %s register failed: %d\n", dssdev->name, r);

		return;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE