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

Commit 18016e35 authored by Stanley.Miao's avatar Stanley.Miao Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: don't power off a panel twice 



If we blank the panel by
echo 1 > /sys/devices/platform/omapfb/graphics/fb0/blank

Then, we reboot the sytem, the kernel will crash at
drivers/video/omap2/dss/core.c:323

This is because the panel is closed twice. Now check the state of a dssdev
to forbid a panel is power on or power off twice.

Signed-off-by: default avatarStanley.Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 41814cfc

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

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


	dev_dbg(&dssdev->dev, "%s\n", __func__);



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	mutex_lock(&md->mutex);



	r = omapdss_sdi_display_enable(dssdev);
@@ -644,6 +647,9 @@ static void acx_panel_power_off(struct omap_dss_device *dssdev) 


	dev_dbg(&dssdev->dev, "%s\n", __func__);



	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	mutex_lock(&md->mutex);



	if (!md->enabled) {

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

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ static int generic_panel_power_on(struct omap_dss_device *dssdev) 
{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;
@@ -58,6 +61,9 @@ err0: 


static void generic_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);

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

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ static int sharp_lq_panel_power_on(struct omap_dss_device *dssdev) 
{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;
@@ -65,6 +68,9 @@ err0: 


static void sharp_lq_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);

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

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ static int sharp_ls_power_on(struct omap_dss_device *dssdev) 
{

	int r = 0;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;
@@ -157,6 +160,9 @@ err0: 


static void sharp_ls_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);

drivers/video/omap2/displays/panel-toppoly-tdo35s.c

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ static int toppoly_tdo_panel_power_on(struct omap_dss_device *dssdev) 
{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;
@@ -65,6 +68,9 @@ err0: 


static void toppoly_tdo_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);