lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP: DSS2: Taal: Change DSI bus locking to avoid deadlock in ESD work

Browse Source 
Move dsi_bus_lock/unlock() out of taal_power_on/off() to avoid deadlock
in taal_esd_work().

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
Jani Nikula
2010-04-12 10:06:14 +03:00
committed by Tomi Valkeinen
parent ee52c0ae68
commit 2c2fc15124
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/video/omap2/displays/panel-taal.c
View File

@@ -672,8 +672,6 @@ static int taal_power_on(struct omap_dss_device *dssdev)
/* it seems we have to wait a bit until taal is ready */ /* it seems we have to wait a bit until taal is ready */
msleep(5); msleep(5);
dsi_bus_lock();
r = omapdss_dsi_display_enable(dssdev); r = omapdss_dsi_display_enable(dssdev);
if (r) { if (r) {
dev_err(&dssdev->dev, "failed to enable DSI\n"); dev_err(&dssdev->dev, "failed to enable DSI\n");
@@ -744,8 +742,6 @@ static int taal_power_on(struct omap_dss_device *dssdev)
omapdss_dsi_vc_enable_hs(TCH, true); omapdss_dsi_vc_enable_hs(TCH, true);
dsi_bus_unlock();
return 0; return 0;
err: err:
dev_err(&dssdev->dev, "error while enabling panel, issuing HW reset\n"); dev_err(&dssdev->dev, "error while enabling panel, issuing HW reset\n");
@@ -754,8 +750,6 @@ err:
omapdss_dsi_display_disable(dssdev); omapdss_dsi_display_disable(dssdev);
err0: err0:
dsi_bus_unlock();
return r; return r;
} }
@@ -764,8 +758,6 @@ static void taal_power_off(struct omap_dss_device *dssdev)
struct taal_data *td = dev_get_drvdata(&dssdev->dev); struct taal_data *td = dev_get_drvdata(&dssdev->dev);
int r; int r;
dsi_bus_lock();
cancel_delayed_work(&td->esd_work); cancel_delayed_work(&td->esd_work);
r = taal_dcs_write_0(DCS_DISPLAY_OFF); r = taal_dcs_write_0(DCS_DISPLAY_OFF);
@@ -784,8 +776,6 @@ static void taal_power_off(struct omap_dss_device *dssdev)
omapdss_dsi_display_disable(dssdev); omapdss_dsi_display_disable(dssdev);
td->enabled = 0; td->enabled = 0;
dsi_bus_unlock();
} }
static int taal_enable(struct omap_dss_device *dssdev) static int taal_enable(struct omap_dss_device *dssdev)
@@ -802,7 +792,12 @@ static int taal_enable(struct omap_dss_device *dssdev)
goto err; goto err;
} }
dsi_bus_lock();
r = taal_power_on(dssdev); r = taal_power_on(dssdev);
dsi_bus_unlock();
if (r) if (r)
goto err; goto err;
@@ -825,9 +820,13 @@ static void taal_disable(struct omap_dss_device *dssdev)
mutex_lock(&td->lock); mutex_lock(&td->lock);
dsi_bus_lock();
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
taal_power_off(dssdev); taal_power_off(dssdev);
dsi_bus_unlock();
dssdev->state = OMAP_DSS_DISPLAY_DISABLED; dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
mutex_unlock(&td->lock); mutex_unlock(&td->lock);
@@ -847,7 +846,12 @@ static int taal_suspend(struct omap_dss_device *dssdev)
goto err; goto err;
} }
dsi_bus_lock();
taal_power_off(dssdev); taal_power_off(dssdev);
dsi_bus_unlock();
dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED; dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
mutex_unlock(&td->lock); mutex_unlock(&td->lock);
@@ -872,7 +876,12 @@ static int taal_resume(struct omap_dss_device *dssdev)
goto err; goto err;
} }
dsi_bus_lock();
r = taal_power_on(dssdev); r = taal_power_on(dssdev);
dsi_bus_unlock();
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
mutex_unlock(&td->lock); mutex_unlock(&td->lock);