- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / video / omap2 / displays / panel-taal.c

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 4f3988a..aaf5d30 100644 (file)
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -31,6 +31,7 @@
 #include <linux/completion.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 
 #include <plat/display.h>
 
@@ -67,6 +68,8 @@
 static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable);
 
 struct taal_data {
+       struct mutex lock;
+
        struct backlight_device *bldev;
 
        unsigned long   hw_guard_end;   /* next value of jiffies when we can
@@ -510,6 +513,8 @@ static int taal_probe(struct omap_dss_device *dssdev)
        }
        td->dssdev = dssdev;
 
+       mutex_init(&td->lock);
+
        td->esd_wq = create_singlethread_workqueue("taal_esd");
        if (td->esd_wq == NULL) {
                dev_err(&dssdev->dev, "can't create ESD workqueue\n");
@@ -697,10 +702,9 @@ static int taal_power_on(struct omap_dss_device *dssdev)
 
        return 0;
 err:
-       dsi_bus_unlock();
-
        omapdss_dsi_display_disable(dssdev);
 err0:
+       dsi_bus_unlock();
        if (dssdev->platform_disable)
                dssdev->platform_disable(dssdev);
 
@@ -733,54 +737,96 @@ static void taal_power_off(struct omap_dss_device *dssdev)
 
 static int taal_enable(struct omap_dss_device *dssdev)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
        int r;
+
        dev_dbg(&dssdev->dev, "enable\n");
 
-       if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)
-               return -EINVAL;
+       mutex_lock(&td->lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
+               r = -EINVAL;
+               goto err;
+       }
 
        r = taal_power_on(dssdev);
        if (r)
-               return r;
+               goto err;
 
        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
+       mutex_unlock(&td->lock);
+
+       return 0;
+err:
+       dev_dbg(&dssdev->dev, "enable failed\n");
+       mutex_unlock(&td->lock);
        return r;
 }
 
 static void taal_disable(struct omap_dss_device *dssdev)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
        dev_dbg(&dssdev->dev, "disable\n");
 
+       mutex_lock(&td->lock);
+
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                taal_power_off(dssdev);
 
        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+
+       mutex_unlock(&td->lock);
 }
 
 static int taal_suspend(struct omap_dss_device *dssdev)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+       int r;
+
        dev_dbg(&dssdev->dev, "suspend\n");
 
-       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-               return -EINVAL;
+       mutex_lock(&td->lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+               r = -EINVAL;
+               goto err;
+       }
 
        taal_power_off(dssdev);
        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
 
+       mutex_unlock(&td->lock);
+
        return 0;
+err:
+       mutex_unlock(&td->lock);
+       return r;
 }
 
 static int taal_resume(struct omap_dss_device *dssdev)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
        int r;
+
        dev_dbg(&dssdev->dev, "resume\n");
 
-       if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
-               return -EINVAL;
+       mutex_lock(&td->lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
+               r = -EINVAL;
+               goto err;
+       }
 
        r = taal_power_on(dssdev);
        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+       mutex_unlock(&td->lock);
+
+       return r;
+err:
+       mutex_unlock(&td->lock);
        return r;
 }
 
@@ -799,6 +845,7 @@ static int taal_update(struct omap_dss_device *dssdev,
 
        dev_dbg(&dssdev->dev, "update %d, %d, %d x %d\n", x, y, w, h);
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
 
        if (!td->enabled) {
@@ -820,18 +867,24 @@ static int taal_update(struct omap_dss_device *dssdev,
                goto err;
 
        /* note: no bus_unlock here. unlock is in framedone_cb */
+       mutex_unlock(&td->lock);
        return 0;
 err:
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return r;
 }
 
 static int taal_sync(struct omap_dss_device *dssdev)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
        dev_dbg(&dssdev->dev, "sync\n");
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
 
        dev_dbg(&dssdev->dev, "sync done\n");
 
@@ -861,13 +914,16 @@ static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 
 static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
        int r;
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
 
        r = _taal_enable_te(dssdev, enable);
 
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
 
        return r;
 }
@@ -875,7 +931,13 @@ static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 static int taal_get_te(struct omap_dss_device *dssdev)
 {
        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-       return td->te_enabled;
+       int r;
+
+       mutex_lock(&td->lock);
+       r = td->te_enabled;
+       mutex_unlock(&td->lock);
+
+       return r;
 }
 
 static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
@@ -885,6 +947,7 @@ static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
 
        dev_dbg(&dssdev->dev, "rotate %d\n", rotate);
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
 
        if (td->enabled) {
@@ -896,16 +959,24 @@ static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
        td->rotate = rotate;
 
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return 0;
 err:
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return r;
 }
 
 static u8 taal_get_rotate(struct omap_dss_device *dssdev)
 {
        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-       return td->rotate;
+       int r;
+
+       mutex_lock(&td->lock);
+       r = td->rotate;
+       mutex_unlock(&td->lock);
+
+       return r;
 }
 
 static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
@@ -915,6 +986,7 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
 
        dev_dbg(&dssdev->dev, "mirror %d\n", enable);
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
        if (td->enabled) {
                r = taal_set_addr_mode(td->rotate, enable);
@@ -925,23 +997,33 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
        td->mirror = enable;
 
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return 0;
 err:
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return r;
 }
 
 static bool taal_get_mirror(struct omap_dss_device *dssdev)
 {
        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-       return td->mirror;
+       int r;
+
+       mutex_lock(&td->lock);
+       r = td->mirror;
+       mutex_unlock(&td->lock);
+
+       return r;
 }
 
 static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
 {
+       struct taal_data *td = dev_get_drvdata(&dssdev->dev);
        u8 id1, id2, id3;
        int r;
 
+       mutex_lock(&td->lock);
        dsi_bus_lock();
 
        r = taal_dcs_read_1(DCS_GET_ID1, &id1);
@@ -955,9 +1037,11 @@ static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
                goto err;
 
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return 0;
 err:
        dsi_bus_unlock();
+       mutex_unlock(&td->lock);
        return r;
 }
 
@@ -971,12 +1055,16 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
        unsigned buf_used = 0;
        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
 
-       if (!td->enabled)
-               return -ENODEV;
-
        if (size < w * h * 3)
                return -ENOMEM;
 
+       mutex_lock(&td->lock);
+
+       if (!td->enabled) {
+               r = -ENODEV;
+               goto err1;
+       }
+
        size = min(w * h * 3,
                        dssdev->panel.timings.x_res *
                        dssdev->panel.timings.y_res * 3);
@@ -995,7 +1083,7 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
 
        r = dsi_vc_set_max_rx_packet_size(TCH, plen);
        if (r)
-               goto err0;
+               goto err2;
 
        while (buf_used < size) {
                u8 dcs_cmd = first ? 0x2e : 0x3e;
@@ -1006,7 +1094,7 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
 
                if (r < 0) {
                        dev_err(&dssdev->dev, "read error\n");
-                       goto err;
+                       goto err3;
                }
 
                buf_used += r;
@@ -1020,16 +1108,18 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
                        dev_err(&dssdev->dev, "signal pending, "
                                        "aborting memory read\n");
                        r = -ERESTARTSYS;
-                       goto err;
+                       goto err3;
                }
        }
 
        r = buf_used;
 
-err:
+err3:
        dsi_vc_set_max_rx_packet_size(TCH, 1);
-err0:
+err2:
        dsi_bus_unlock();
+err1:
+       mutex_unlock(&td->lock);
        return r;
 }
 
@@ -1041,8 +1131,12 @@ static void taal_esd_work(struct work_struct *work)
        u8 state1, state2;
        int r;
 
-       if (!td->enabled)
+       mutex_lock(&td->lock);
+
+       if (!td->enabled) {
+               mutex_unlock(&td->lock);
                return;
+       }
 
        dsi_bus_lock();
 
@@ -1084,16 +1178,19 @@ static void taal_esd_work(struct work_struct *work)
 
        queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
 
+       mutex_unlock(&td->lock);
        return;
 err:
        dev_err(&dssdev->dev, "performing LCD reset\n");
 
-       taal_disable(dssdev);
-       taal_enable(dssdev);
+       taal_power_off(dssdev);
+       taal_power_on(dssdev);
 
        dsi_bus_unlock();
 
        queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
+
+       mutex_unlock(&td->lock);
 }
 
 static int taal_set_update_mode(struct omap_dss_device *dssdev,