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

Commit 9e7e9372 authored by Archit Taneja's avatar Archit Taneja
Browse files

OMAPDSS: DSI: Pass dsi platform device wherever possible 



Many of the DSI functions receive the connected panel's omap_dss_device pointer
as an argument. The platform device pointer is then derived via omap_dss_device
pointers.

Most of these functions don't really require omap_dss_device pointer anymore
since we now keep copies of parameters in the driver data which were previously
available only via omap_dss_device. Replace the arguments with platform device
pointers for such functions.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent e84dc1cc

drivers/video/omap2/dss/dsi.c

+39 −50
Original line number Original line Diff line number Diff line
@@ -2163,9 +2163,8 @@ static unsigned dsi_get_line_buf_size(struct platform_device *dsidev) 
	}

	}

}

}





static int dsi_set_lane_config(struct omap_dss_device *dssdev)

static int dsi_set_lane_config(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	static const u8 offsets[] = { 0, 4, 8, 12, 16 };

	static const u8 offsets[] = { 0, 4, 8, 12, 16 };

	static const enum dsi_lane_function functions[] = {

	static const enum dsi_lane_function functions[] = {
@@ -2307,10 +2306,9 @@ static void dsi_cio_timings(struct platform_device *dsidev) 
}

}





/* lane masks have lane 0 at lsb. mask_p for positive lines, n for negative */

/* lane masks have lane 0 at lsb. mask_p for positive lines, n for negative */

static void dsi_cio_enable_lane_override(struct omap_dss_device *dssdev,

static void dsi_cio_enable_lane_override(struct platform_device *dsidev,

		unsigned mask_p, unsigned mask_n)

		unsigned mask_p, unsigned mask_n)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int i;

	int i;

	u32 l;

	u32 l;
@@ -2357,9 +2355,8 @@ static void dsi_cio_disable_lane_override(struct platform_device *dsidev) 
	REG_FLD_MOD(dsidev, DSI_DSIPHY_CFG10, 0, 22, 17);

	REG_FLD_MOD(dsidev, DSI_DSIPHY_CFG10, 0, 22, 17);

}

}





static int dsi_cio_wait_tx_clk_esc_reset(struct omap_dss_device *dssdev)

static int dsi_cio_wait_tx_clk_esc_reset(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int t, i;

	int t, i;

	bool in_use[DSI_MAX_NR_LANES];

	bool in_use[DSI_MAX_NR_LANES];
@@ -2407,9 +2404,8 @@ static int dsi_cio_wait_tx_clk_esc_reset(struct omap_dss_device *dssdev) 
}

}





/* return bitmask of enabled lanes, lane0 being the lsb */

/* return bitmask of enabled lanes, lane0 being the lsb */

static unsigned dsi_get_lane_mask(struct omap_dss_device *dssdev)

static unsigned dsi_get_lane_mask(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	unsigned mask = 0;

	unsigned mask = 0;

	int i;

	int i;
@@ -2422,16 +2418,15 @@ static unsigned dsi_get_lane_mask(struct omap_dss_device *dssdev) 
	return mask;

	return mask;

}

}





static int dsi_cio_init(struct omap_dss_device *dssdev)

static int dsi_cio_init(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int r;

	int r;

	u32 l;

	u32 l;





	DSSDBGF();

	DSSDBGF();





	r = dss_dsi_enable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

	r = dss_dsi_enable_pads(dsi->module_id, dsi_get_lane_mask(dsidev));

	if (r)

	if (r)

		return r;

		return r;
@@ -2448,7 +2443,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) 
		goto err_scp_clk_dom;

		goto err_scp_clk_dom;

	}

	}





	r = dsi_set_lane_config(dssdev);

	r = dsi_set_lane_config(dsidev);

	if (r)

	if (r)

		goto err_scp_clk_dom;

		goto err_scp_clk_dom;
@@ -2483,7 +2478,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) 
			mask_p |= 1 << i;

			mask_p |= 1 << i;

		}

		}





		dsi_cio_enable_lane_override(dssdev, mask_p, 0);

		dsi_cio_enable_lane_override(dsidev, mask_p, 0);

	}

	}





	r = dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_ON);

	r = dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_ON);
@@ -2500,7 +2495,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) 
	dsi_if_enable(dsidev, false);

	dsi_if_enable(dsidev, false);

	REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 1, 20, 20); /* LP_CLK_ENABLE */

	REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 1, 20, 20); /* LP_CLK_ENABLE */





	r = dsi_cio_wait_tx_clk_esc_reset(dssdev);

	r = dsi_cio_wait_tx_clk_esc_reset(dsidev);

	if (r)

	if (r)

		goto err_tx_clk_esc_rst;

		goto err_tx_clk_esc_rst;
@@ -2541,13 +2536,12 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) 
		dsi_cio_disable_lane_override(dsidev);

		dsi_cio_disable_lane_override(dsidev);

err_scp_clk_dom:

err_scp_clk_dom:

	dsi_disable_scp_clk(dsidev);

	dsi_disable_scp_clk(dsidev);

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dsidev));

	return r;

	return r;

}

}





static void dsi_cio_uninit(struct omap_dss_device *dssdev)

static void dsi_cio_uninit(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	/* DDR_CLK_ALWAYS_ON */

	/* DDR_CLK_ALWAYS_ON */
@@ -2555,7 +2549,7 @@ static void dsi_cio_uninit(struct omap_dss_device *dssdev) 




	dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);

	dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);

	dsi_disable_scp_clk(dsidev);

	dsi_disable_scp_clk(dsidev);

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dsidev));

}

}





static void dsi_config_tx_fifo(struct platform_device *dsidev,

static void dsi_config_tx_fifo(struct platform_device *dsidev,
@@ -3148,10 +3142,9 @@ int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel) 
}

}

EXPORT_SYMBOL(dsi_vc_send_null);

EXPORT_SYMBOL(dsi_vc_send_null);





static int dsi_vc_write_nosync_common(struct omap_dss_device *dssdev,

static int dsi_vc_write_nosync_common(struct platform_device *dsidev,

		int channel, u8 *data, int len, enum dss_dsi_content_type type)

		int channel, u8 *data, int len, enum dss_dsi_content_type type)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	int r;

	int r;





	if (len == 0) {

	if (len == 0) {
@@ -3182,7 +3175,9 @@ static int dsi_vc_write_nosync_common(struct omap_dss_device *dssdev, 
int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len)

		u8 *data, int len)

{

{

	return dsi_vc_write_nosync_common(dssdev, channel, data, len,

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);



	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

			DSS_DSI_CONTENT_DCS);

			DSS_DSI_CONTENT_DCS);

}

}

EXPORT_SYMBOL(dsi_vc_dcs_write_nosync);

EXPORT_SYMBOL(dsi_vc_dcs_write_nosync);
@@ -3190,7 +3185,9 @@ EXPORT_SYMBOL(dsi_vc_dcs_write_nosync); 
int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len)

		u8 *data, int len)

{

{

	return dsi_vc_write_nosync_common(dssdev, channel, data, len,

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);



	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

			DSS_DSI_CONTENT_GENERIC);

			DSS_DSI_CONTENT_GENERIC);

}

}

EXPORT_SYMBOL(dsi_vc_generic_write_nosync);

EXPORT_SYMBOL(dsi_vc_generic_write_nosync);
@@ -3201,7 +3198,7 @@ static int dsi_vc_write_common(struct omap_dss_device *dssdev, int channel, 
	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	int r;

	int r;





	r = dsi_vc_write_nosync_common(dssdev, channel, data, len, type);

	r = dsi_vc_write_nosync_common(dsidev, channel, data, len, type);

	if (r)

	if (r)

		goto err;

		goto err;
@@ -3279,10 +3276,9 @@ int dsi_vc_generic_write_2(struct omap_dss_device *dssdev, int channel, 
}

}

EXPORT_SYMBOL(dsi_vc_generic_write_2);

EXPORT_SYMBOL(dsi_vc_generic_write_2);





static int dsi_vc_dcs_send_read_request(struct omap_dss_device *dssdev,

static int dsi_vc_dcs_send_read_request(struct platform_device *dsidev,

		int channel, u8 dcs_cmd)

		int channel, u8 dcs_cmd)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int r;

	int r;
@@ -3300,10 +3296,9 @@ static int dsi_vc_dcs_send_read_request(struct omap_dss_device *dssdev, 
	return 0;

	return 0;

}

}





static int dsi_vc_generic_send_read_request(struct omap_dss_device *dssdev,

static int dsi_vc_generic_send_read_request(struct platform_device *dsidev,

		int channel, u8 *reqdata, int reqlen)

		int channel, u8 *reqdata, int reqlen)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	u16 data;

	u16 data;

	u8 data_type;

	u8 data_type;
@@ -3452,7 +3447,7 @@ int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd, 
	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	int r;

	int r;





	r = dsi_vc_dcs_send_read_request(dssdev, channel, dcs_cmd);

	r = dsi_vc_dcs_send_read_request(dsidev, channel, dcs_cmd);

	if (r)

	if (r)

		goto err;

		goto err;
@@ -3483,7 +3478,7 @@ static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel, 
	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	int r;

	int r;





	r = dsi_vc_generic_send_read_request(dssdev, channel, reqdata, reqlen);

	r = dsi_vc_generic_send_read_request(dsidev, channel, reqdata, reqlen);

	if (r)

	if (r)

		return r;

		return r;
@@ -3765,14 +3760,12 @@ static void dsi_set_hs_tx_timeout(struct platform_device *dsidev, 
			(total_ticks * 1000) / (fck / 1000 / 1000));

			(total_ticks * 1000) / (fck / 1000 / 1000));

}

}





static void dsi_config_vp_num_line_buffers(struct omap_dss_device *dssdev)

static void dsi_config_vp_num_line_buffers(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int num_line_buffers;

	int num_line_buffers;





	if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {

	if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {

		struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

		int bpp = dsi_get_pixel_size(dsi->pix_fmt);

		int bpp = dsi_get_pixel_size(dsi->pix_fmt);

		unsigned line_buf_size = dsi_get_line_buf_size(dsidev);

		unsigned line_buf_size = dsi_get_line_buf_size(dsidev);

		struct omap_video_timings *timings = &dsi->timings;

		struct omap_video_timings *timings = &dsi->timings;
@@ -3793,9 +3786,8 @@ static void dsi_config_vp_num_line_buffers(struct omap_dss_device *dssdev) 
	REG_FLD_MOD(dsidev, DSI_CTRL, num_line_buffers, 13, 12);

	REG_FLD_MOD(dsidev, DSI_CTRL, num_line_buffers, 13, 12);

}

}





static void dsi_config_vp_sync_events(struct omap_dss_device *dssdev)

static void dsi_config_vp_sync_events(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	bool vsync_end = dsi->vm_timings.vp_vsync_end;

	bool vsync_end = dsi->vm_timings.vp_vsync_end;

	bool hsync_end = dsi->vm_timings.vp_hsync_end;

	bool hsync_end = dsi->vm_timings.vp_hsync_end;
@@ -3812,9 +3804,8 @@ static void dsi_config_vp_sync_events(struct omap_dss_device *dssdev) 
	dsi_write_reg(dsidev, DSI_CTRL, r);

	dsi_write_reg(dsidev, DSI_CTRL, r);

}

}





static void dsi_config_blanking_modes(struct omap_dss_device *dssdev)

static void dsi_config_blanking_modes(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int blanking_mode = dsi->vm_timings.blanking_mode;

	int blanking_mode = dsi->vm_timings.blanking_mode;

	int hfp_blanking_mode = dsi->vm_timings.hfp_blanking_mode;

	int hfp_blanking_mode = dsi->vm_timings.hfp_blanking_mode;
@@ -4069,11 +4060,11 @@ static int dsi_proto_config(struct omap_dss_device *dssdev) 




	dsi_write_reg(dsidev, DSI_CTRL, r);

	dsi_write_reg(dsidev, DSI_CTRL, r);





	dsi_config_vp_num_line_buffers(dssdev);

	dsi_config_vp_num_line_buffers(dsidev);





	if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {

	if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {

		dsi_config_vp_sync_events(dssdev);

		dsi_config_vp_sync_events(dsidev);

		dsi_config_blanking_modes(dssdev);

		dsi_config_blanking_modes(dsidev);

		dsi_config_cmd_mode_interleaving(dssdev);

		dsi_config_cmd_mode_interleaving(dssdev);

	}

	}
@@ -4085,9 +4076,8 @@ static int dsi_proto_config(struct omap_dss_device *dssdev) 
	return 0;

	return 0;

}

}





static void dsi_proto_timings(struct omap_dss_device *dssdev)

static void dsi_proto_timings(struct platform_device *dsidev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;

	unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;

	unsigned tclk_pre, tclk_post;

	unsigned tclk_pre, tclk_post;
@@ -4534,8 +4524,7 @@ static void dsi_framedone_timeout_work_callback(struct work_struct *work) 




static void dsi_framedone_irq_callback(void *data, u32 mask)

static void dsi_framedone_irq_callback(void *data, u32 mask)

{

{

	struct omap_dss_device *dssdev = (struct omap_dss_device *) data;

	struct platform_device *dsidev = (struct platform_device *) data;

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	/* Note: We get FRAMEDONE when DISPC has finished sending pixels and

	/* Note: We get FRAMEDONE when DISPC has finished sending pixels and
@@ -4619,7 +4608,7 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev) 
		irq = dispc_mgr_get_framedone_irq(dssdev->manager->id);

		irq = dispc_mgr_get_framedone_irq(dssdev->manager->id);





		r = omap_dispc_register_isr(dsi_framedone_irq_callback,

		r = omap_dispc_register_isr(dsi_framedone_irq_callback,

			(void *) dssdev, irq);

			(void *) dsidev, irq);

		if (r) {

		if (r) {

			DSSERR("can't get FRAMEDONE irq\n");

			DSSERR("can't get FRAMEDONE irq\n");

			goto err;

			goto err;
@@ -4660,7 +4649,7 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev) 
err1:

err1:

	if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)

	if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)

		omap_dispc_unregister_isr(dsi_framedone_irq_callback,

		omap_dispc_unregister_isr(dsi_framedone_irq_callback,

			(void *) dssdev, irq);

			(void *) dsidev, irq);

err:

err:

	return r;

	return r;

}

}
@@ -4676,7 +4665,7 @@ static void dsi_display_uninit_dispc(struct omap_dss_device *dssdev) 
		irq = dispc_mgr_get_framedone_irq(dssdev->manager->id);

		irq = dispc_mgr_get_framedone_irq(dssdev->manager->id);





		omap_dispc_unregister_isr(dsi_framedone_irq_callback,

		omap_dispc_unregister_isr(dsi_framedone_irq_callback,

			(void *) dssdev, irq);

			(void *) dsidev, irq);

	}

	}

}

}
@@ -4726,13 +4715,13 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) 




	DSSDBG("PLL OK\n");

	DSSDBG("PLL OK\n");





	r = dsi_cio_init(dssdev);

	r = dsi_cio_init(dsidev);

	if (r)

	if (r)

		goto err2;

		goto err2;





	_dsi_print_reset_status(dsidev);

	_dsi_print_reset_status(dsidev);





	dsi_proto_timings(dssdev);

	dsi_proto_timings(dsidev);

	dsi_set_lp_clk_divisor(dssdev);

	dsi_set_lp_clk_divisor(dssdev);





	if (1)

	if (1)
@@ -4752,7 +4741,7 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) 




	return 0;

	return 0;

err3:

err3:

	dsi_cio_uninit(dssdev);

	dsi_cio_uninit(dsidev);

err2:

err2:

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);
@@ -4783,7 +4772,7 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, 
	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dsi_cio_uninit(dssdev);

	dsi_cio_uninit(dsidev);

	dsi_pll_uninit(dsidev, disconnect_lanes);

	dsi_pll_uninit(dsidev, disconnect_lanes);

}

}