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

Commit 69b2048f authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: move timing functions 



Move check/set/get_timings() from omap_dss_device to omap_dss_driver.

This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 36511312

arch/arm/plat-omap/include/plat/display.h

+11 −7
Original line number Diff line number Diff line
@@ -462,13 +462,6 @@ struct omap_dss_device { 


	enum omap_dss_display_state state;



	int (*check_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*set_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*get_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



	/* platform specific  */

	int (*platform_enable)(struct omap_dss_device *dssdev);

	void (*platform_disable)(struct omap_dss_device *dssdev);
@@ -514,6 +507,13 @@ struct omap_dss_driver { 
			u16 *xres, u16 *yres);

	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);



	int (*check_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*set_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*get_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);

	u32 (*get_wss)(struct omap_dss_device *dssdev);

};
@@ -570,6 +570,10 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev); 


int omapdss_dpi_display_enable(struct omap_dss_device *dssdev);

void omapdss_dpi_display_disable(struct omap_dss_device *dssdev);

void dpi_set_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

int dpi_check_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);

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

+2 −2
Original line number Diff line number Diff line
@@ -516,8 +516,6 @@ static int taal_probe(struct omap_dss_device *dssdev) 


	dev_set_drvdata(&dssdev->dev, td);



	dssdev->get_timings = taal_get_timings;



	/* if no platform set_backlight() defined, presume DSI backlight

	 * control */

	if (!dssdev->set_backlight)
@@ -1118,6 +1116,8 @@ static struct omap_dss_driver taal_driver = { 
	.run_test	= taal_run_test,

	.memory_read	= taal_memory_read,



	.get_timings	= taal_get_timings,



	.driver         = {

		.name   = "taal",

		.owner  = THIS_MODULE,

drivers/video/omap2/dss/display.c

+5 −5
Original line number Diff line number Diff line
@@ -135,10 +135,10 @@ static ssize_t display_timings_show(struct device *dev, 
	struct omap_dss_device *dssdev = to_dss_device(dev);

	struct omap_video_timings t;



	if (!dssdev->get_timings)

	if (!dssdev->driver->get_timings)

		return -ENOENT;



	dssdev->get_timings(dssdev, &t);

	dssdev->driver->get_timings(dssdev, &t);



	return snprintf(buf, PAGE_SIZE, "%u,%u/%u/%u/%u,%u/%u/%u/%u\n",

			t.pixel_clock,
@@ -153,7 +153,7 @@ static ssize_t display_timings_store(struct device *dev, 
	struct omap_video_timings t;

	int r, found;



	if (!dssdev->set_timings || !dssdev->check_timings)

	if (!dssdev->driver->set_timings || !dssdev->driver->check_timings)

		return -ENOENT;



	found = 0;
@@ -172,11 +172,11 @@ static ssize_t display_timings_store(struct device *dev, 
				&t.y_res, &t.vfp, &t.vbp, &t.vsw) != 9)

		return -EINVAL;



	r = dssdev->check_timings(dssdev, &t);

	r = dssdev->driver->check_timings(dssdev, &t);

	if (r)

		return r;



	dssdev->set_timings(dssdev, &t);

	dssdev->driver->set_timings(dssdev, &t);



	return size;

}

drivers/video/omap2/dss/dpi.c

+4 −12
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) 
}

EXPORT_SYMBOL(omapdss_dpi_display_disable);



static void dpi_set_timings(struct omap_dss_device *dssdev,

void dpi_set_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings)

{

	DSSDBG("dpi_set_timings\n");
@@ -237,8 +237,9 @@ static void dpi_set_timings(struct omap_dss_device *dssdev, 
		dispc_go(OMAP_DSS_CHANNEL_LCD);

	}

}

EXPORT_SYMBOL(dpi_set_timings);



static int dpi_check_timings(struct omap_dss_device *dssdev,

int dpi_check_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings)

{

	bool is_tft;
@@ -292,21 +293,12 @@ static int dpi_check_timings(struct omap_dss_device *dssdev, 


	return 0;

}



static void dpi_get_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings)

{

	*timings = dssdev->panel.timings;

}

EXPORT_SYMBOL(dpi_check_timings);



int dpi_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("init_display\n");



	dssdev->set_timings = dpi_set_timings;

	dssdev->check_timings = dpi_check_timings;

	dssdev->get_timings = dpi_get_timings;



	return 0;

}

drivers/video/omap2/dss/sdi.c

+0 −8
Original line number Diff line number Diff line
@@ -150,18 +150,10 @@ void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) 
}

EXPORT_SYMBOL(omapdss_sdi_display_disable);



static void sdi_get_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings)

{

	*timings = dssdev->panel.timings;

}



int sdi_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("SDI init\n");



	dssdev->get_timings = sdi_get_timings;



	return 0;

}