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

Commit 60548a2b authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge output work from Archit 

The series removes bunch of dssdev references from the omapdss output drivers.
This is made to let us move to a common panel framework later, and also allows
us to implement OMAP's writeback support, which has been proven difficult with
the current output drivers.

OMAPDSS: APPLY: Constify timings argument in dss_mgr_set_timings
OMAPDSS: DPI: Add locking for DPI interface
OMAPDSS: Displays: Add locking in generic DPI panel driver
OMAPDSS: DPI: Maintain our own timings field in driver data
OMAPDSS: DPI displays: Take care of panel timings in the driver itself
OMAPDSS: DSI: Maintain own copy of timings in driver data
OMAPDSS: DSI: Add function to set panel size for command mode panels
OMAPDSS: DSI: Update manager timings on a manual update
OMAPDSS: HDMI: Use our own omap_video_timings field when setting interface timings
OMAPDSS: HDMI: Add locking for hdmi interface set timing functions
OMAPDSS: SDI: Create a function to set timings
OMAPDSS: SDI: Maintain our own timings field in driver data
OMAPDSS: VENC: Split VENC into interface and panel driver
OMAPDSS: VENC: Maintain our own timings field in driver data
OMAPDSS: RFBI: Remove partial update support
OMAPDSS: RFBI: Add function to set panel size
OMAPDSS: DSI: Maintain copy of pixel format in driver data
OMAPDSS: RFBI: Maintain copy of pixel size in driver data
OMAPDSS: RFBI: Maintain copy of number of data lines in driver data
OMAPDSS: DPI: Maintain copy of number of data lines in driver data
OMAPDSS: SDI: Maintain copy of data pairs in driver data
OMAPDSS: DSI: Maintain copy of operation mode in driver data
OMAPDSS: DSI: Rename dsi_videomode_data to dsi_videomode_timings
OMAPDSS: DSI: Maintain copy of video mode timings in driver data
OMAPDSS: RFBI: Maitain copy of rfbi timings in driver data
OMAPDSS: VENC: Maintain copy of venc type in driver data
OMAPDSS: VENC: Maintian copy of video output polarity info in private data
parents a2496dc9 89e71956

drivers/video/omap2/displays/panel-acx565akm.c

+4 −10
Original line number Diff line number Diff line
@@ -600,6 +600,9 @@ static int acx_panel_power_on(struct omap_dss_device *dssdev) 


	mutex_lock(&md->mutex);



	omapdss_sdi_set_timings(dssdev, &dssdev->panel.timings);

	omapdss_sdi_set_datapairs(dssdev, dssdev->phy.sdi.datapairs);



	r = omapdss_sdi_display_enable(dssdev);

	if (r) {

		pr_err("%s sdi enable failed\n", __func__);
@@ -731,18 +734,9 @@ static int acx_panel_resume(struct omap_dss_device *dssdev) 
static void acx_panel_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		omapdss_sdi_display_disable(dssdev);

	omapdss_sdi_set_timings(dssdev, timings);



	dssdev->panel.timings = *timings;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {

		r = omapdss_sdi_display_enable(dssdev);

		if (r)

			dev_err(&dssdev->dev, "%s enable failed\n", __func__);

	}

}



static int acx_panel_check_timings(struct omap_dss_device *dssdev,

drivers/video/omap2/displays/panel-generic-dpi.c

+68 −8
Original line number Diff line number Diff line
@@ -545,6 +545,8 @@ struct panel_drv_data { 
	struct omap_dss_device *dssdev;



	struct panel_config *panel_config;



	struct mutex lock;

};



static inline struct panel_generic_dpi_data
@@ -563,6 +565,9 @@ static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev) 
	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);

	omapdss_dpi_set_data_lines(dssdev, dssdev->phy.dpi.data_lines);



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;
@@ -634,6 +639,8 @@ static int generic_dpi_panel_probe(struct omap_dss_device *dssdev) 
	drv_data->dssdev = dssdev;

	drv_data->panel_config = panel_config;



	mutex_init(&drv_data->lock);



	dev_set_drvdata(&dssdev->dev, drv_data);



	return 0;
@@ -652,56 +659,108 @@ static void __exit generic_dpi_panel_remove(struct omap_dss_device *dssdev) 


static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)

{

	int r = 0;

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);

	int r;



	mutex_lock(&drv_data->lock);



	r = generic_dpi_panel_power_on(dssdev);

	if (r)

		return r;

		goto err;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

err:

	mutex_unlock(&drv_data->lock);



	return 0;

	return r;

}



static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&drv_data->lock);



	generic_dpi_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;



	mutex_unlock(&drv_data->lock);

}



static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&drv_data->lock);



	generic_dpi_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;



	mutex_unlock(&drv_data->lock);



	return 0;

}



static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)

{

	int r = 0;

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);

	int r;



	mutex_lock(&drv_data->lock);



	r = generic_dpi_panel_power_on(dssdev);

	if (r)

		return r;

		goto err;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

err:

	mutex_unlock(&drv_data->lock);



	return r;

}



static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	dpi_set_timings(dssdev, timings);

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&drv_data->lock);



	omapdss_dpi_set_timings(dssdev, timings);



	dssdev->panel.timings = *timings;



	mutex_unlock(&drv_data->lock);

}



static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&drv_data->lock);



	*timings = dssdev->panel.timings;



	mutex_unlock(&drv_data->lock);

}



static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	return dpi_check_timings(dssdev, timings);

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);

	int r;



	mutex_lock(&drv_data->lock);



	r = dpi_check_timings(dssdev, timings);



	mutex_unlock(&drv_data->lock);



	return r;

}



static struct omap_dss_driver dpi_driver = {
@@ -714,6 +773,7 @@ static struct omap_dss_driver dpi_driver = { 
	.resume		= generic_dpi_panel_resume,



	.set_timings	= generic_dpi_panel_set_timings,

	.get_timings	= generic_dpi_panel_get_timings,

	.check_timings	= generic_dpi_panel_check_timings,



	.driver         = {

drivers/video/omap2/displays/panel-lgphilips-lb035q02.c

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ static int lb035q02_panel_power_on(struct omap_dss_device *dssdev) 
	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);

	omapdss_dpi_set_data_lines(dssdev, dssdev->phy.dpi.data_lines);



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;

drivers/video/omap2/displays/panel-n8x0.c

+25 −5
Original line number Diff line number Diff line
@@ -150,11 +150,17 @@ static void blizzard_ctrl_setup_update(struct omap_dss_device *dssdev, 
			BLIZZARD_SRC_WRITE_LCD :

			BLIZZARD_SRC_WRITE_LCD_DESTRUCTIVE;



	omap_rfbi_configure(dssdev, 16, 8);

	omapdss_rfbi_set_pixel_size(dssdev, 16);

	omapdss_rfbi_set_data_lines(dssdev, 8);



	omap_rfbi_configure(dssdev);



	blizzard_write(BLIZZARD_INPUT_WIN_X_START_0, tmp, 18);



	omap_rfbi_configure(dssdev, 16, 16);

	omapdss_rfbi_set_pixel_size(dssdev, 16);

	omapdss_rfbi_set_data_lines(dssdev, 16);



	omap_rfbi_configure(dssdev);

}



static void mipid_transfer(struct spi_device *spi, int cmd, const u8 *wbuf,
@@ -297,6 +303,12 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev) 
			goto err_plat_en;

	}



	omapdss_rfbi_set_size(dssdev, dssdev->panel.timings.x_res,

		dssdev->panel.timings.y_res);

	omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size);

	omapdss_rfbi_set_data_lines(dssdev, dssdev->phy.rfbi.data_lines);

	omapdss_rfbi_set_interface_timings(dssdev, &dssdev->ctrl.rfbi_timings);



	r = omapdss_rfbi_display_enable(dssdev);

	if (r)

		goto err_rfbi_en;
@@ -625,17 +637,25 @@ static int n8x0_panel_update(struct omap_dss_device *dssdev, 
		u16 x, u16 y, u16 w, u16 h)

{

	struct panel_drv_data *ddata = get_drv_data(dssdev);

	u16 dw, dh;



	dev_dbg(&dssdev->dev, "update\n");



	dw = dssdev->panel.timings.x_res;

	dh = dssdev->panel.timings.y_res;



	if (x != 0 || y != 0 || w != dw || h != dh) {

		dev_err(&dssdev->dev, "invaid update region %d, %d, %d, %d\n",

			x, y, w, h);

		return -EINVAL;

	}



	mutex_lock(&ddata->lock);

	rfbi_bus_lock();



	omap_rfbi_prepare_update(dssdev, &x, &y, &w, &h);



	blizzard_ctrl_setup_update(dssdev, x, y, w, h);



	omap_rfbi_update(dssdev, x, y, w, h, update_done, NULL);

	omap_rfbi_update(dssdev, update_done, NULL);



	mutex_unlock(&ddata->lock);

drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev) 
	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);

	omapdss_dpi_set_data_lines(dssdev, dssdev->phy.dpi.data_lines);



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;