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

Commit 064c2a47 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: DSS: add a param to dpi_select_source which specifies it's port number 



Add a 'port' parameter in dpi_select_source. The param tells the port
number of the DPI instance that we want to configure. We use this number
to select the overlay manager for that DPI instance.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent f7e38fe9

drivers/video/fbdev/omap2/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev) 
	if (r)

		goto err_get_dispc;



	r = dss_dpi_select_source(out->manager->id);

	r = dss_dpi_select_source(out->port_num, out->manager->id);

	if (r)

		goto err_src_sel;

drivers/video/fbdev/omap2/dss/dss.c

+6 −6
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct dss_features { 
	const char *parent_clk_name;

	enum omap_display_type *ports;

	int num_ports;

	int (*dpi_select_source)(enum omap_channel channel);

	int (*dpi_select_source)(int port, enum omap_channel channel);

};



static struct {
@@ -566,7 +566,7 @@ enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void) 
	return REG_GET(DSS_CONTROL, 15, 15);

}



static int dss_dpi_select_source_omap2_omap3(enum omap_channel channel)

static int dss_dpi_select_source_omap2_omap3(int port, enum omap_channel channel)

{

	if (channel != OMAP_DSS_CHANNEL_LCD)

		return -EINVAL;
@@ -574,7 +574,7 @@ static int dss_dpi_select_source_omap2_omap3(enum omap_channel channel) 
	return 0;

}



static int dss_dpi_select_source_omap4(enum omap_channel channel)

static int dss_dpi_select_source_omap4(int port, enum omap_channel channel)

{

	int val;
@@ -594,7 +594,7 @@ static int dss_dpi_select_source_omap4(enum omap_channel channel) 
	return 0;

}



static int dss_dpi_select_source_omap5(enum omap_channel channel)

static int dss_dpi_select_source_omap5(int port, enum omap_channel channel)

{

	int val;
@@ -620,9 +620,9 @@ static int dss_dpi_select_source_omap5(enum omap_channel channel) 
	return 0;

}



int dss_dpi_select_source(enum omap_channel channel)

int dss_dpi_select_source(int port, enum omap_channel channel)

{

	return dss.feat->dpi_select_source(channel);

	return dss.feat->dpi_select_source(port, channel);

}



static int dss_get_clocks(void)

drivers/video/fbdev/omap2/dss/dss.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int dss_init_platform_driver(void) __init; 
void dss_uninit_platform_driver(void);



unsigned long dss_get_dispc_clk_rate(void);

int dss_dpi_select_source(enum omap_channel channel);

int dss_dpi_select_source(int port, enum omap_channel channel);

void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);

enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void);

const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);