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

Commit 64ba4f74 authored by Sumit Semwal's avatar Sumit Semwal Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers 



The interface drivers (dsi.c, sdi.c etc) need to call dispc functions with
dssdev->manager->id as a parameter to specify the DISPC channel which they want
to configure/use, this is required as the same functions are now used to configure
dispc registers of different channels.

The following dispc functions are changed to incorporate channel as an argument:
	-dispc_enable_fifohandcheck()
	-dispc_set_lcd_size()
	-dispc_set_parallel_interface_mode()
	-dispc_set_tft_data_lines()
	-dispc_set_lcd_display_type()
	-dispc_set_lcd_timings()

Signed-off-by: default avatarSumit Semwal <sumit.semwal@ti.com>
Signed-off-by: default avatarMukund Mittal <mmittal@ti.com>
Signed-off-by: default avatarSamreen <samreen@ti.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
[tomi.valkeinen@nokia.com: fixed trivial compile error]
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 8613b000

drivers/video/omap2/dss/dispc.c

+22 −16
Original line number Diff line number Diff line
@@ -941,13 +941,13 @@ void dispc_enable_replication(enum omap_plane plane, bool enable) 
	enable_clocks(0);

}



void dispc_set_lcd_size(u16 width, u16 height)

void dispc_set_lcd_size(enum omap_channel channel, u16 width, u16 height)

{

	u32 val;

	BUG_ON((width > (1 << 11)) || (height > (1 << 11)));

	val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);

	enable_clocks(1);

	dispc_write_reg(DISPC_SIZE_LCD(OMAP_DSS_CHANNEL_LCD), val);

	dispc_write_reg(DISPC_SIZE_LCD(channel), val);

	enable_clocks(0);

}
@@ -1843,7 +1843,7 @@ void dispc_pck_free_enable(bool enable) 
	enable_clocks(0);

}



void dispc_enable_fifohandcheck(bool enable)

void dispc_enable_fifohandcheck(enum omap_channel channel, bool enable)

{

	enable_clocks(1);

	REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 16, 16);
@@ -1851,7 +1851,8 @@ void dispc_enable_fifohandcheck(bool enable) 
}





void dispc_set_lcd_display_type(enum omap_lcd_display_type type)

void dispc_set_lcd_display_type(enum omap_channel channel,

		enum omap_lcd_display_type type)

{

	int mode;
@@ -1994,7 +1995,7 @@ bool dispc_trans_key_enabled(enum omap_channel ch) 
}





void dispc_set_tft_data_lines(u8 data_lines)

void dispc_set_tft_data_lines(enum omap_channel channel, u8 data_lines)

{

	int code;
@@ -2021,7 +2022,8 @@ void dispc_set_tft_data_lines(u8 data_lines) 
	enable_clocks(0);

}



void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode)

void dispc_set_parallel_interface_mode(enum omap_channel channel,

		enum omap_parallel_interface_mode mode)

{

	u32 l;

	int stallmode;
@@ -2054,9 +2056,11 @@ void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode) 
	l = dispc_read_reg(DISPC_CONTROL);



	l = FLD_MOD(l, stallmode, 11, 11);



	if (channel == OMAP_DSS_CHANNEL_LCD) {

		l = FLD_MOD(l, gpout0, 15, 15);

		l = FLD_MOD(l, gpout1, 16, 16);



	}

	dispc_write_reg(DISPC_CONTROL, l);



	enable_clocks(0);
@@ -2093,8 +2097,8 @@ bool dispc_lcd_timings_ok(struct omap_video_timings *timings) 
			timings->vfp, timings->vbp);

}



static void _dispc_set_lcd_timings(int hsw, int hfp, int hbp,

				   int vsw, int vfp, int vbp)

static void _dispc_set_lcd_timings(enum omap_channel channel, int hsw,

		int hfp, int hbp, int vsw, int vfp, int vbp)

{

	u32 timing_h, timing_v;
@@ -2113,13 +2117,14 @@ static void _dispc_set_lcd_timings(int hsw, int hfp, int hbp, 
	}



	enable_clocks(1);

	dispc_write_reg(DISPC_TIMING_H(OMAP_DSS_CHANNEL_LCD), timing_h);

	dispc_write_reg(DISPC_TIMING_V(OMAP_DSS_CHANNEL_LCD), timing_v);

	dispc_write_reg(DISPC_TIMING_H(channel), timing_h);

	dispc_write_reg(DISPC_TIMING_V(channel), timing_v);

	enable_clocks(0);

}



/* change name to mode? */

void dispc_set_lcd_timings(struct omap_video_timings *timings)

void dispc_set_lcd_timings(enum omap_channel channel,

		struct omap_video_timings *timings)

{

	unsigned xtot, ytot;

	unsigned long ht, vt;
@@ -2129,10 +2134,11 @@ void dispc_set_lcd_timings(struct omap_video_timings *timings) 
				timings->vfp, timings->vbp))

		BUG();



	_dispc_set_lcd_timings(timings->hsw, timings->hfp, timings->hbp,

			timings->vsw, timings->vfp, timings->vbp);

	_dispc_set_lcd_timings(channel, timings->hsw, timings->hfp,

			timings->hbp, timings->vsw, timings->vfp,

			timings->vbp);



	dispc_set_lcd_size(timings->x_res, timings->y_res);

	dispc_set_lcd_size(channel, timings->x_res, timings->y_res);



	xtot = timings->x_res + timings->hfp + timings->hsw + timings->hbp;

	ytot = timings->y_res + timings->vfp + timings->vsw + timings->vbp;

drivers/video/omap2/dss/dpi.c

+7 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev) 
		t->pixel_clock = pck;

	}



	dispc_set_lcd_timings(t);

	dispc_set_lcd_timings(dssdev->manager->id, t);



err0:

	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
@@ -145,10 +145,12 @@ static int dpi_basic_init(struct omap_dss_device *dssdev) 


	is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;



	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);

	dispc_set_lcd_display_type(is_tft ? OMAP_DSS_LCD_DISPLAY_TFT :

			OMAP_DSS_LCD_DISPLAY_STN);

	dispc_set_tft_data_lines(dssdev->phy.dpi.data_lines);

	dispc_set_parallel_interface_mode(dssdev->manager->id,

			OMAP_DSS_PARALLELMODE_BYPASS);

	dispc_set_lcd_display_type(dssdev->manager->id, is_tft ?

			OMAP_DSS_LCD_DISPLAY_TFT : OMAP_DSS_LCD_DISPLAY_STN);

	dispc_set_tft_data_lines(dssdev->manager->id,

			dssdev->phy.dpi.data_lines);



	return 0;

}

drivers/video/omap2/dss/dsi.c

+8 −6
Original line number Diff line number Diff line
@@ -2888,7 +2888,7 @@ int omap_dsi_prepare_update(struct omap_dss_device *dssdev, 
	if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {

		dss_setup_partial_planes(dssdev, x, y, w, h,

				enlarge_update_area);

		dispc_set_lcd_size(*w, *h);

		dispc_set_lcd_size(dssdev->manager->id, *w, *h);

	}



	return 0;
@@ -2947,12 +2947,14 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev) 
		return r;

	}



	dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);

	dispc_set_lcd_display_type(dssdev->manager->id,

			OMAP_DSS_LCD_DISPLAY_TFT);



	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_DSI);

	dispc_enable_fifohandcheck(1);

	dispc_set_parallel_interface_mode(dssdev->manager->id,

			OMAP_DSS_PARALLELMODE_DSI);

	dispc_enable_fifohandcheck(dssdev->manager->id, 1);



	dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);

	dispc_set_tft_data_lines(dssdev->manager->id, dssdev->ctrl.pixel_size);



	{

		struct omap_video_timings timings = {
@@ -2964,7 +2966,7 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev) 
			.vbp		= 0,

		};



		dispc_set_lcd_timings(&timings);

		dispc_set_lcd_timings(dssdev->manager->id, &timings);

	}



	return 0;

drivers/video/omap2/dss/dss.h

+11 −8
Original line number Diff line number Diff line
@@ -333,9 +333,9 @@ void dispc_disable_sidle(void); 
void dispc_lcd_enable_signal_polarity(bool act_high);

void dispc_lcd_enable_signal(bool enable);

void dispc_pck_free_enable(bool enable);

void dispc_enable_fifohandcheck(bool enable);

void dispc_enable_fifohandcheck(enum omap_channel channel, bool enable);



void dispc_set_lcd_size(u16 width, u16 height);

void dispc_set_lcd_size(enum omap_channel channel, u16 width, u16 height);

void dispc_set_digit_size(u16 width, u16 height);

u32 dispc_get_plane_fifo_size(enum omap_plane plane);

void dispc_setup_plane_fifo(enum omap_plane plane, u32 low, u32 high);
@@ -369,9 +369,11 @@ bool dispc_is_channel_enabled(enum omap_channel channel); 
int dispc_enable_plane(enum omap_plane plane, bool enable);

void dispc_enable_replication(enum omap_plane plane, bool enable);



void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode);

void dispc_set_tft_data_lines(u8 data_lines);

void dispc_set_lcd_display_type(enum omap_lcd_display_type type);

void dispc_set_parallel_interface_mode(enum omap_channel channel,

		enum omap_parallel_interface_mode mode);

void dispc_set_tft_data_lines(enum omap_channel channel, u8 data_lines);

void dispc_set_lcd_display_type(enum omap_channel channel,

		enum omap_lcd_display_type type);

void dispc_set_loadmode(enum omap_dss_load_mode mode);



void dispc_set_default_color(enum omap_channel channel, u32 color);
@@ -388,7 +390,8 @@ bool dispc_trans_key_enabled(enum omap_channel ch); 
bool dispc_alpha_blending_enabled(enum omap_channel ch);



bool dispc_lcd_timings_ok(struct omap_video_timings *timings);

void dispc_set_lcd_timings(struct omap_video_timings *timings);

void dispc_set_lcd_timings(enum omap_channel channel,

		struct omap_video_timings *timings);

unsigned long dispc_fclk_rate(void);

unsigned long dispc_lclk_rate(void);

unsigned long dispc_pclk_rate(void);
@@ -425,8 +428,8 @@ void rfbi_dump_regs(struct seq_file *s); 


int rfbi_configure(int rfbi_module, int bpp, int lines);

void rfbi_enable_rfbi(bool enable);

void rfbi_transfer_area(u16 width, u16 height,

			     void (callback)(void *data), void *data);

void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,

		u16 height, void (callback)(void *data), void *data);

void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);

unsigned long rfbi_get_max_tx_rate(void);

int rfbi_init_display(struct omap_dss_device *display);

drivers/video/omap2/dss/rfbi.c

+11 −9
Original line number Diff line number Diff line
@@ -301,8 +301,8 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width, 
}

EXPORT_SYMBOL(omap_rfbi_write_pixels);



void rfbi_transfer_area(u16 width, u16 height,

			     void (callback)(void *data), void *data)

void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,

		u16 height, void (*callback)(void *data), void *data)

{

	u32 l;
@@ -311,9 +311,9 @@ void rfbi_transfer_area(u16 width, u16 height, 


	DSSDBG("rfbi_transfer_area %dx%d\n", width, height);



	dispc_set_lcd_size(width, height);

	dispc_set_lcd_size(dssdev->manager->id, width, height);



	dispc_enable_channel(OMAP_DSS_CHANNEL_LCD, true);

	dispc_enable_channel(dssdev->manager->id, true);



	rfbi.framedone_callback = callback;

	rfbi.framedone_callback_data = data;
@@ -887,7 +887,7 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev, 


	if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {

		dss_setup_partial_planes(dssdev, x, y, w, h, true);

		dispc_set_lcd_size(*w, *h);

		dispc_set_lcd_size(dssdev->manager->id, *w, *h);

	}



	return 0;
@@ -899,7 +899,7 @@ int omap_rfbi_update(struct omap_dss_device *dssdev, 
		void (*callback)(void *), void *data)

{

	if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {

		rfbi_transfer_area(w, h, callback, data);

		rfbi_transfer_area(dssdev, w, h, callback, data);

	} else {

		struct omap_overlay *ovl;

		void __iomem *addr;
@@ -1018,11 +1018,13 @@ int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev) 
		goto err1;

	}



	dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);

	dispc_set_lcd_display_type(dssdev->manager->id,

			OMAP_DSS_LCD_DISPLAY_TFT);



	dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_RFBI);

	dispc_set_parallel_interface_mode(dssdev->manager->id,

			OMAP_DSS_PARALLELMODE_RFBI);



	dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);

	dispc_set_tft_data_lines(dssdev->manager->id, dssdev->ctrl.pixel_size);



	rfbi_configure(dssdev->phy.rfbi.channel,

			       dssdev->ctrl.pixel_size,