* [PATCH V3] OMAP: DSS2: don't power off a panel twice
@ 2010-09-03 3:03 Stanley.Miao
2010-09-03 4:25 ` stanley.miao
2010-10-21 9:02 ` Grazvydas Ignotas
0 siblings, 2 replies; 5+ messages in thread
From: Stanley.Miao @ 2010-09-03 3:03 UTC (permalink / raw)
To: tomi.valkeinen; +Cc: linux-omap, bryan.wu, mathieu.poirier, linux-fbdev
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: Stanley.Miao <stanley.miao@windriver.com>
---
drivers/video/omap2/displays/panel-acx565akm.c | 6 ++++++
drivers/video/omap2/displays/panel-generic.c | 6 ++++++
.../video/omap2/displays/panel-sharp-lq043t1dg01.c | 6 ++++++
.../video/omap2/displays/panel-sharp-ls037v7dw01.c | 6 ++++++
.../video/omap2/displays/panel-toppoly-tdo35s.c | 6 ++++++
.../video/omap2/displays/panel-tpo-td043mtea1.c | 6 ++++++
6 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index 07fbb8a..e773106 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -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) {
diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c
index 300eff5..395a68d 100644
--- a/drivers/video/omap2/displays/panel-generic.c
+++ b/drivers/video/omap2/displays/panel-generic.c
@@ -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);
diff --git a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
index 1026746..0c6896c 100644
--- a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
+++ b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
@@ -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);
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index 7d9eb2b..9a138f6 100644
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -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);
diff --git a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
index e320e67..526e906 100644
--- a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
+++ b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
@@ -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);
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index e866e76..dbe9d43 100644
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -269,6 +269,9 @@ static int tpo_td043_power_on(struct omap_dss_device *dssdev)
int nreset_gpio = dssdev->reset_gpio;
int r;
+ if (dssdev->state = OMAP_DSS_DISPLAY_ACTIVE)
+ return 0;
+
r = omapdss_dpi_display_enable(dssdev);
if (r)
goto err0;
@@ -308,6 +311,9 @@ static void tpo_td043_power_off(struct omap_dss_device *dssdev)
struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
int nreset_gpio = dssdev->reset_gpio;
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return;
+
tpo_td043_write(tpo_td043->spi, 3,
TPO_R03_VAL_STANDBY | TPO_R03_EN_PWM);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V3] OMAP: DSS2: don't power off a panel twice
2010-09-03 3:03 [PATCH V3] OMAP: DSS2: don't power off a panel twice Stanley.Miao
@ 2010-09-03 4:25 ` stanley.miao
2010-10-21 9:02 ` Grazvydas Ignotas
1 sibling, 0 replies; 5+ messages in thread
From: stanley.miao @ 2010-09-03 4:25 UTC (permalink / raw)
To: Stanley.Miao
Cc: tomi.valkeinen, linux-omap, bryan.wu, mathieu.poirier,
linux-fbdev
Changes from V2:
1, Removed the panel-taal.c part.
Stanley.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V3] OMAP: DSS2: don't power off a panel twice
2010-09-03 3:03 [PATCH V3] OMAP: DSS2: don't power off a panel twice Stanley.Miao
2010-09-03 4:25 ` stanley.miao
@ 2010-10-21 9:02 ` Grazvydas Ignotas
2010-10-21 9:20 ` Guruswamy, Senthilvadivu
2010-10-21 13:46 ` Tomi Valkeinen
1 sibling, 2 replies; 5+ messages in thread
From: Grazvydas Ignotas @ 2010-10-21 9:02 UTC (permalink / raw)
To: tomi.valkeinen
Cc: Stanley.Miao, linux-omap, bryan.wu, mathieu.poirier, linux-fbdev
Tomi can you queue this? This has been tested by multiple people now,
also see here:
http://marc.info/?l=linux-omap&m\x128759415821646&w=2
On Fri, Sep 3, 2010 at 6:03 AM, Stanley.Miao <stanley.miao@windriver.com> wrote:
> 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: Stanley.Miao <stanley.miao@windriver.com>
> ---
> drivers/video/omap2/displays/panel-acx565akm.c | 6 ++++++
> drivers/video/omap2/displays/panel-generic.c | 6 ++++++
> .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 6 ++++++
> .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 6 ++++++
> .../video/omap2/displays/panel-toppoly-tdo35s.c | 6 ++++++
> .../video/omap2/displays/panel-tpo-td043mtea1.c | 6 ++++++
> 6 files changed, 36 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
> index 07fbb8a..e773106 100644
> --- a/drivers/video/omap2/displays/panel-acx565akm.c
> +++ b/drivers/video/omap2/displays/panel-acx565akm.c
> @@ -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) {
> diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c
> index 300eff5..395a68d 100644
> --- a/drivers/video/omap2/displays/panel-generic.c
> +++ b/drivers/video/omap2/displays/panel-generic.c
> @@ -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);
>
> diff --git a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
> index 1026746..0c6896c 100644
> --- a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
> +++ b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
> @@ -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);
>
> diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
> index 7d9eb2b..9a138f6 100644
> --- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
> +++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
> @@ -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);
>
> diff --git a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
> index e320e67..526e906 100644
> --- a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
> +++ b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
> @@ -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);
>
> diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
> index e866e76..dbe9d43 100644
> --- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
> +++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
> @@ -269,6 +269,9 @@ static int tpo_td043_power_on(struct omap_dss_device *dssdev)
> int nreset_gpio = dssdev->reset_gpio;
> int r;
>
> + if (dssdev->state = OMAP_DSS_DISPLAY_ACTIVE)
> + return 0;
> +
> r = omapdss_dpi_display_enable(dssdev);
> if (r)
> goto err0;
> @@ -308,6 +311,9 @@ static void tpo_td043_power_off(struct omap_dss_device *dssdev)
> struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
> int nreset_gpio = dssdev->reset_gpio;
>
> + if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
> + return;
> +
> tpo_td043_write(tpo_td043->spi, 3,
> TPO_R03_VAL_STANDBY | TPO_R03_EN_PWM);
>
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH V3] OMAP: DSS2: don't power off a panel twice
2010-10-21 9:02 ` Grazvydas Ignotas
@ 2010-10-21 9:20 ` Guruswamy, Senthilvadivu
2010-10-21 13:46 ` Tomi Valkeinen
1 sibling, 0 replies; 5+ messages in thread
From: Guruswamy, Senthilvadivu @ 2010-10-21 9:20 UTC (permalink / raw)
To: Grazvydas Ignotas, tomi.valkeinen@nokia.com
Cc: Stanley.Miao, linux-omap@vger.kernel.org, bryan.wu@canonical.com,
mathieu.poirier@canonical.com, linux-fbdev@vger.kernel.org
> -----Original Message-----
> From: linux-fbdev-owner@vger.kernel.org [mailto:linux-fbdev-
> owner@vger.kernel.org] On Behalf Of Grazvydas Ignotas
> Sent: Thursday, October 21, 2010 2:32 PM
> To: tomi.valkeinen@nokia.com
> Cc: Stanley.Miao; linux-omap@vger.kernel.org; bryan.wu@canonical.com;
> mathieu.poirier@canonical.com; linux-fbdev@vger.kernel.org
> Subject: Re: [PATCH V3] OMAP: DSS2: don't power off a panel twice
>
> Tomi can you queue this? This has been tested by multiple people now,
> also see here:
> http://marc.info/?l=linux-omap&m\x128759415821646&w=2
>
> On Fri, Sep 3, 2010 at 6:03 AM, Stanley.Miao <stanley.miao@windriver.com>
> wrote:
> > 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: Stanley.Miao <stanley.miao@windriver.com>
> > ---
> > drivers/video/omap2/displays/panel-acx565akm.c | 6 ++++++
> > drivers/video/omap2/displays/panel-generic.c | 6 ++++++
> > .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 6 ++++++
> > .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 6 ++++++
> > .../video/omap2/displays/panel-toppoly-tdo35s.c | 6 ++++++
> > .../video/omap2/displays/panel-tpo-td043mtea1.c | 6 ++++++
> >
[Senthil] Why is this change not applicable for panel-taal.c ?
> >
> > diff --git a/drivers/video/omap2/displays/panel-acx565akm.c
> b/drivers/video/omap2/displays/panel-acx565akm.c
> > index 07fbb8a..e773106 100644
> > --- a/drivers/video/omap2/displays/panel-acx565akm.c
> > +++ b/drivers/video/omap2/displays/panel-acx565akm.c
> > @@ -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) {
<Snip>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V3] OMAP: DSS2: don't power off a panel twice
2010-10-21 9:02 ` Grazvydas Ignotas
2010-10-21 9:20 ` Guruswamy, Senthilvadivu
@ 2010-10-21 13:46 ` Tomi Valkeinen
1 sibling, 0 replies; 5+ messages in thread
From: Tomi Valkeinen @ 2010-10-21 13:46 UTC (permalink / raw)
To: ext Grazvydas Ignotas
Cc: Stanley.Miao, linux-omap@vger.kernel.org, bryan.wu@canonical.com,
mathieu.poirier@canonical.com, linux-fbdev@vger.kernel.org
On Thu, 2010-10-21 at 11:02 +0200, ext Grazvydas Ignotas wrote:
> Tomi can you queue this? This has been tested by multiple people now,
> also see here:
> http://marc.info/?l=linux-omap&m\x128759415821646&w=2
Yes, I seem to have missed/forgotten this. I'll add it to my tree.
Tomi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-21 13:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-03 3:03 [PATCH V3] OMAP: DSS2: don't power off a panel twice Stanley.Miao
2010-09-03 4:25 ` stanley.miao
2010-10-21 9:02 ` Grazvydas Ignotas
2010-10-21 9:20 ` Guruswamy, Senthilvadivu
2010-10-21 13:46 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).