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

OMAP: DSS2: Pass platform_device as an argument in dsi functions 



The DSI interface is represented as a platform device, using the DSI platform
driver(dsi.c). The current DSI driver design is capable of running only one
instance of a DSI device. On OMAP4, there are 2 very similar DSI modules which
can be represented as instances of "omapdss_dsi" platform device.

Add member "module" in "dssdev.phy.dsi" that tells us which DSI module's lanes
the panel is connected to. Modify dsi.c functions to take the device's
platform_device struct pointer, provide functions dsi_get_dsidev_from_dssdev()
and dsi_get_dsidev_from_id() take the panel's omap_dss_device and module number
respectively, and return the platform_device pointer. Currently, the dsi struct
is declared globally and is accessed when dsi data is needed. The new pdev
argument will be used later to provide the platform device's dsi related data.

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

drivers/video/omap2/dss/dispc.c

+6 −2
Original line number Diff line number Diff line
@@ -2239,6 +2239,7 @@ static void dispc_get_lcd_divisor(enum omap_channel channel, int *lck_div, 


unsigned long dispc_fclk_rate(void)

{

	struct platform_device *dsidev;

	unsigned long r = 0;



	switch (dss_get_dispc_clk_source()) {
@@ -2246,7 +2247,8 @@ unsigned long dispc_fclk_rate(void) 
		r = dss_clk_get_rate(DSS_CLK_FCK);

		break;

	case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:

		r = dsi_get_pll_hsdiv_dispc_rate();

		dsidev = dsi_get_dsidev_from_id(0);

		r = dsi_get_pll_hsdiv_dispc_rate(dsidev);

		break;

	default:

		BUG();
@@ -2257,6 +2259,7 @@ unsigned long dispc_fclk_rate(void) 


unsigned long dispc_lclk_rate(enum omap_channel channel)

{

	struct platform_device *dsidev;

	int lcd;

	unsigned long r;

	u32 l;
@@ -2270,7 +2273,8 @@ unsigned long dispc_lclk_rate(enum omap_channel channel) 
		r = dss_clk_get_rate(DSS_CLK_FCK);

		break;

	case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:

		r = dsi_get_pll_hsdiv_dispc_rate();

		dsidev = dsi_get_dsidev_from_id(0);

		r = dsi_get_pll_hsdiv_dispc_rate(dsidev);

		break;

	default:

		BUG();

drivers/video/omap2/dss/dpi.c

+23 −7
Original line number Diff line number Diff line
@@ -37,8 +37,18 @@ 


static struct {

	struct regulator *vdds_dsi_reg;

	struct platform_device *dsidev;

} dpi;



static struct platform_device *dpi_get_dsidev(enum omap_dss_clk_source clk)

{

	int dsi_module;



	dsi_module = clk == OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1;



	return dsi_get_dsidev_from_id(dsi_module);

}



static bool dpi_use_dsi_pll(struct omap_dss_device *dssdev)

{

	if (dssdev->clocks.dispc.dispc_fclk_src ==
@@ -58,12 +68,12 @@ static int dpi_set_dsi_clk(struct omap_dss_device *dssdev, bool is_tft, 
	struct dispc_clock_info dispc_cinfo;

	int r;



	r = dsi_pll_calc_clock_div_pck(is_tft, pck_req, &dsi_cinfo,

			&dispc_cinfo);

	r = dsi_pll_calc_clock_div_pck(dpi.dsidev, is_tft, pck_req,

			&dsi_cinfo, &dispc_cinfo);

	if (r)

		return r;



	r = dsi_pll_set_clock_div(&dsi_cinfo);

	r = dsi_pll_set_clock_div(dpi.dsidev, &dsi_cinfo);

	if (r)

		return r;
@@ -189,7 +199,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) 


	if (dpi_use_dsi_pll(dssdev)) {

		dss_clk_enable(DSS_CLK_SYSCK);

		r = dsi_pll_init(0, 1);

		r = dsi_pll_init(dpi.dsidev, 0, 1);

		if (r)

			goto err3;

	}
@@ -206,7 +216,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) 


err4:

	if (dpi_use_dsi_pll(dssdev))

		dsi_pll_uninit(true);

		dsi_pll_uninit(dpi.dsidev, true);

err3:

	if (dpi_use_dsi_pll(dssdev))

		dss_clk_disable(DSS_CLK_SYSCK);
@@ -227,7 +237,7 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) 


	if (dpi_use_dsi_pll(dssdev)) {

		dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

		dsi_pll_uninit(true);

		dsi_pll_uninit(dpi.dsidev, true);

		dss_clk_disable(DSS_CLK_SYSCK);

	}
@@ -272,7 +282,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev, 


	if (dpi_use_dsi_pll(dssdev)) {

		struct dsi_clock_info dsi_cinfo;

		r = dsi_pll_calc_clock_div_pck(is_tft,

		r = dsi_pll_calc_clock_div_pck(dpi.dsidev, is_tft,

				timings->pixel_clock * 1000,

				&dsi_cinfo, &dispc_cinfo);
@@ -319,6 +329,12 @@ int dpi_init_display(struct omap_dss_device *dssdev) 
		dpi.vdds_dsi_reg = vdds_dsi;

	}



	if (dpi_use_dsi_pll(dssdev)) {

		enum omap_dss_clk_source dispc_fclk_src =

			dssdev->clocks.dispc.dispc_fclk_src;

		dpi.dsidev = dpi_get_dsidev(dispc_fclk_src);

	}



	return 0;

}

drivers/video/omap2/dss/dsi.c

+516 −422

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/omap2/dss/dss.c

+9 −3
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ void dss_dump_regs(struct seq_file *s) 


void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)

{

	struct platform_device *dsidev;

	int b;

	u8 start, end;
@@ -309,7 +310,8 @@ void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src) 
		break;

	case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:

		b = 1;

		dsi_wait_pll_hsdiv_dispc_active();

		dsidev = dsi_get_dsidev_from_id(0);

		dsi_wait_pll_hsdiv_dispc_active(dsidev);

		break;

	default:

		BUG();
@@ -324,6 +326,7 @@ void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src) 


void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src)

{

	struct platform_device *dsidev;

	int b;



	switch (clk_src) {
@@ -332,7 +335,8 @@ void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src) 
		break;

	case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI:

		b = 1;

		dsi_wait_pll_hsdiv_dsi_active();

		dsidev = dsi_get_dsidev_from_id(0);

		dsi_wait_pll_hsdiv_dsi_active(dsidev);

		break;

	default:

		BUG();
@@ -346,6 +350,7 @@ void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src) 
void dss_select_lcd_clk_source(enum omap_channel channel,

		enum omap_dss_clk_source clk_src)

{

	struct platform_device *dsidev;

	int b, ix, pos;



	if (!dss_has_feature(FEAT_LCD_CLK_SRC))
@@ -358,7 +363,8 @@ void dss_select_lcd_clk_source(enum omap_channel channel, 
	case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:

		BUG_ON(channel != OMAP_DSS_CHANNEL_LCD);

		b = 1;

		dsi_wait_pll_hsdiv_dispc_active();

		dsidev = dsi_get_dsidev_from_id(0);

		dsi_wait_pll_hsdiv_dispc_active(dsidev);

		break;

	default:

		BUG();

drivers/video/omap2/dss/dss.h

+20 −11
Original line number Diff line number Diff line
@@ -287,18 +287,21 @@ void dsi_restore_context(void); 


int dsi_init_display(struct omap_dss_device *display);

void dsi_irq_handler(void);

unsigned long dsi_get_pll_hsdiv_dispc_rate(void);

int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo);

int dsi_pll_calc_clock_div_pck(bool is_tft, unsigned long req_pck,

		struct dsi_clock_info *cinfo,

unsigned long dsi_get_pll_hsdiv_dispc_rate(struct platform_device *dsidev);

int dsi_pll_set_clock_div(struct platform_device *dsidev,

		struct dsi_clock_info *cinfo);

int dsi_pll_calc_clock_div_pck(struct platform_device *dsidev, bool is_tft,

		unsigned long req_pck, struct dsi_clock_info *cinfo,

		struct dispc_clock_info *dispc_cinfo);

int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv);

void dsi_pll_uninit(bool disconnect_lanes);

int dsi_pll_init(struct platform_device *dsidev, bool enable_hsclk,

		bool enable_hsdiv);

void dsi_pll_uninit(struct platform_device *dsidev, bool disconnect_lanes);

void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,

		u32 fifo_size, enum omap_burst_size *burst_size,

		u32 *fifo_low, u32 *fifo_high);

void dsi_wait_pll_hsdiv_dispc_active(void);

void dsi_wait_pll_hsdiv_dsi_active(void);

void dsi_wait_pll_hsdiv_dispc_active(struct platform_device *dsidev);

void dsi_wait_pll_hsdiv_dsi_active(struct platform_device *dsidev);

struct platform_device *dsi_get_dsidev_from_id(int module);

#else

static inline int dsi_init_platform_driver(void)

{
@@ -307,17 +310,23 @@ static inline int dsi_init_platform_driver(void) 
static inline void dsi_uninit_platform_driver(void)

{

}

static inline unsigned long dsi_get_pll_hsdiv_dispc_rate(void)

static inline unsigned long dsi_get_pll_hsdiv_dispc_rate(struct platform_device *dsidev)

{

	WARN("%s: DSI not compiled in, returning rate as 0\n", __func__);

	return 0;

}

static inline void dsi_wait_pll_hsdiv_dispc_active(void)

static inline void dsi_wait_pll_hsdiv_dispc_active(struct platform_device *dsidev)

{

}

static inline void dsi_wait_pll_hsdiv_dsi_active(void)

static inline void dsi_wait_pll_hsdiv_dsi_active(struct platform_device *dsidev)

{

}

static inline struct platform_device *dsi_get_dsidev_from_id(int module)

{

	WARN("%s: DSI not compiled in, returning platform device as NULL\n",

			__func__);

	return NULL;

}

#endif



/* DPI */

CRA Git | Maintained and supported by SUSTech CRA and CCSE