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

Commit 37ac60e4 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: move enable/disable/suspend/resume 



Move enable/disable/suspend/resume 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 18946f62

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

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


	enum omap_dss_display_state state;



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

	void (*disable)(struct omap_dss_device *dssdev);



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

	int (*resume)(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,
@@ -571,11 +565,21 @@ int omap_dsi_update(struct omap_dss_device *dssdev, 
		u16 x, u16 y, u16 w, u16 h,

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



int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);

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);



int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);



int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev);

void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev);

int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,

		u16 *x, u16 *y, u16 *w, u16 *h);

int omap_rfbi_update(struct omap_dss_device *dssdev,

		u16 x, u16 y, u16 w, u16 h,

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





#endif

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

+49 −7
Original line number Diff line number Diff line
@@ -35,6 +35,35 @@ static struct omap_video_timings generic_panel_timings = { 
	.vbp		= 7,

};



static int generic_panel_power_on(struct omap_dss_device *dssdev)

{

	int r;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void generic_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	omapdss_dpi_display_disable(dssdev);

}



static int generic_panel_probe(struct omap_dss_device *dssdev)

{

	dssdev->panel.config = OMAP_DSS_LCD_TFT;
@@ -51,27 +80,40 @@ static int generic_panel_enable(struct omap_dss_device *dssdev) 
{

	int r = 0;



	if (dssdev->platform_enable)

		r = dssdev->platform_enable(dssdev);



	r = generic_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static void generic_panel_disable(struct omap_dss_device *dssdev)

{

	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);

	generic_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int generic_panel_suspend(struct omap_dss_device *dssdev)

{

	generic_panel_disable(dssdev);

	generic_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int generic_panel_resume(struct omap_dss_device *dssdev)

{

	return generic_panel_enable(dssdev);

	int r = 0;



	r = generic_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static struct omap_dss_driver generic_driver = {

drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c

+53 −14
Original line number Diff line number Diff line
@@ -39,6 +39,41 @@ static struct omap_video_timings sharp_lq_timings = { 
	.vbp		= 2,

};



static int sharp_lq_panel_power_on(struct omap_dss_device *dssdev)

{

	int r;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	/* wait couple of vsyncs until enabling the LCD */

	msleep(50);



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void sharp_lq_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	/* wait at least 5 vsyncs after disabling the LCD */

	msleep(100);



	omapdss_dpi_display_disable(dssdev);

}



static int sharp_lq_panel_probe(struct omap_dss_device *dssdev)

{
@@ -58,36 +93,40 @@ static int sharp_lq_panel_enable(struct omap_dss_device *dssdev) 
{

	int r = 0;



	r = sharp_lq_panel_power_on(dssdev);

	if (r)

		return r;



	/* wait couple of vsyncs until enabling the LCD */

	msleep(50);



	if (dssdev->platform_enable)

		r = dssdev->platform_enable(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return r;

	return 0;

}



static void sharp_lq_panel_disable(struct omap_dss_device *dssdev)

{

	sharp_lq_panel_power_off(dssdev);



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	/* wait at least 5 vsyncs after disabling the LCD */



	msleep(100);

	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int sharp_lq_panel_suspend(struct omap_dss_device *dssdev)

{

	sharp_lq_panel_disable(dssdev);

	sharp_lq_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int sharp_lq_panel_resume(struct omap_dss_device *dssdev)

{

	return sharp_lq_panel_enable(dssdev);

	int r = 0;



	r = sharp_lq_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static struct omap_dss_driver sharp_lq_driver = {

drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c

+36 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/regulator/consumer.h>

#include <linux/err.h>



#include <plat/display.h>
@@ -54,20 +53,31 @@ static void sharp_ls_panel_remove(struct omap_dss_device *dssdev) 
{

}



static int sharp_ls_panel_enable(struct omap_dss_device *dssdev)

static int sharp_ls_power_on(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	/* wait couple of vsyncs until enabling the LCD */

	msleep(50);



	if (dssdev->platform_enable)

	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)

static void sharp_ls_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);
@@ -75,17 +85,37 @@ static void sharp_ls_panel_disable(struct omap_dss_device *dssdev) 
	/* wait at least 5 vsyncs after disabling the LCD */



	msleep(100);



	omapdss_dpi_display_disable(dssdev);

}



static int sharp_ls_panel_enable(struct omap_dss_device *dssdev)

{

	int r;

	r = sharp_ls_power_on(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

	return r;

}



static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)

{

	sharp_ls_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int sharp_ls_panel_suspend(struct omap_dss_device *dssdev)

{

	sharp_ls_panel_disable(dssdev);

	sharp_ls_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)

{

	return sharp_ls_panel_enable(dssdev);

	int r;

	r = sharp_ls_power_on(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

	return r;

}



static struct omap_dss_driver sharp_ls_driver = {

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

+65 −14
Original line number Diff line number Diff line
@@ -620,14 +620,12 @@ static void taal_remove(struct omap_dss_device *dssdev) 
	kfree(td);

}



static int taal_enable(struct omap_dss_device *dssdev)

static int taal_power_on(struct omap_dss_device *dssdev)

{

	struct taal_data *td = dev_get_drvdata(&dssdev->dev);

	u8 id1, id2, id3;

	int r;



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



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)
@@ -637,6 +635,16 @@ static int taal_enable(struct omap_dss_device *dssdev) 
	/* it seems we have to wait a bit until taal is ready */

	msleep(5);



	dsi_bus_lock();



	r = omapdss_dsi_display_enable(dssdev);

	if (r) {

		dev_err(&dssdev->dev, "failed to enable DSI\n");

		goto err0;

	}



	omapdss_dsi_vc_enable_hs(TCH, false);



	r = taal_sleep_out(td);

	if (r)

		goto err;
@@ -675,19 +683,27 @@ static int taal_enable(struct omap_dss_device *dssdev) 
		td->intro_printed = true;

	}



	omapdss_dsi_vc_enable_hs(TCH, true);



	dsi_bus_unlock();



	return 0;

err:

	dsi_bus_unlock();



	omapdss_dsi_display_disable(dssdev);

err0:

	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	return r;

}



static void taal_disable(struct omap_dss_device *dssdev)

static void taal_power_off(struct omap_dss_device *dssdev)

{

	struct taal_data *td = dev_get_drvdata(&dssdev->dev);



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

	dsi_bus_lock();



	cancel_delayed_work(&td->esd_work);
@@ -697,32 +713,67 @@ static void taal_disable(struct omap_dss_device *dssdev) 
	/* wait a bit so that the message goes through */

	msleep(10);



	omapdss_dsi_display_disable(dssdev);



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	td->enabled = 0;



	dsi_bus_unlock();

}



static int taal_enable(struct omap_dss_device *dssdev)

{

	int r;

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



	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)

		return -EINVAL;



	r = taal_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return r;

}



static void taal_disable(struct omap_dss_device *dssdev)

{

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



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		taal_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int taal_suspend(struct omap_dss_device *dssdev)

{

	struct taal_data *td = dev_get_drvdata(&dssdev->dev);

	struct backlight_device *bldev = td->bldev;

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



	bldev->props.power = FB_BLANK_POWERDOWN;

	taal_bl_update_status(bldev);

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return -EINVAL;



	taal_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;



	return 0;

}



static int taal_resume(struct omap_dss_device *dssdev)

{

	struct taal_data *td = dev_get_drvdata(&dssdev->dev);

	struct backlight_device *bldev = td->bldev;

	int r;

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



	bldev->props.power = FB_BLANK_UNBLANK;

	taal_bl_update_status(bldev);

	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)

		return -EINVAL;



	return 0;

	r = taal_power_on(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

	return r;

}



static void taal_framedone_cb(int err, void *data)