Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next

4 files changed, 133 insertions, 34 deletions

diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 8d8e1fe1901c..74d29b552901 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -41,7 +41,7 @@ config PANEL_NEC_NL8048HL11_01B
 
 config PANEL_PICODLP
         tristate "TI PICO DLP mini-projector"
-        depends on OMAP2_DSS && I2C
+        depends on OMAP2_DSS_DPI && I2C
         help
                 A mini-projector used in TI's SDP4430 and EVM boards
                 For more info please visit http://www.dlp.com/projector/
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 519c47d2057f..28b9a6d61b0f 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -297,6 +297,72 @@ static struct panel_config generic_dpi_panels[] = {
 
                 .name                   = "apollon",
         },
+        /* FocalTech ETM070003DH6 */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 28000,
+
+                        .hsw            = 48,
+                        .hfp            = 40,
+                        .hbp            = 40,
+
+                        .vsw            = 3,
+                        .vfp            = 13,
+                        .vbp            = 29,
+                },
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS,
+                .name                   = "focaltech_etm070003dh6",
+        },
+
+        /* Microtips Technologies - UMSH-8173MD */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 34560,
+
+                        .hsw            = 13,
+                        .hfp            = 101,
+                        .hbp            = 101,
+
+                        .vsw            = 23,
+                        .vfp            = 1,
+                        .vbp            = 1,
+                },
+                .acbi                   = 0x0,
+                .acb                    = 0x0,
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC,
+                .power_on_delay         = 0,
+                .power_off_delay        = 0,
+                .name                   = "microtips_umsh_8173md",
+        },
+
+        /* OrtusTech COM43H4M10XTC */
+        {
+                {
+                        .x_res          = 480,
+                        .y_res          = 272,
+
+                        .pixel_clock    = 8000,
+
+                        .hsw            = 41,
+                        .hfp            = 8,
+                        .hbp            = 4,
+
+                        .vsw            = 10,
+                        .vfp            = 4,
+                        .vbp            = 2,
+                },
+                .config                 = OMAP_DSS_LCD_TFT,
+
+                .name                   = "ortustech_com43h4m10xtc",
+        },
 };
 
 struct panel_drv_data {
diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index 8365e77e09ff..0eb31caddca8 100644
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -163,50 +163,93 @@ static void nec_8048_panel_remove(struct omap_dss_device *dssdev)
         kfree(necd);
 }
 
-static int nec_8048_panel_enable(struct omap_dss_device *dssdev)
+static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
 {
-        int r = 0;
+        int r;
         struct nec_8048_data *necd = dev_get_drvdata(&dssdev->dev);
         struct backlight_device *bl = necd->bl;
 
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+                return 0;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
         if (dssdev->platform_enable) {
                 r = dssdev->platform_enable(dssdev);
                 if (r)
-                        return r;
+                        goto err1;
         }
 
         r = nec_8048_bl_update_status(bl);
         if (r < 0)
                 dev_err(&dssdev->dev, "failed to set lcd brightness\n");
 
-        r = omapdss_dpi_display_enable(dssdev);
-
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
         return r;
 }
 
-static void nec_8048_panel_disable(struct omap_dss_device *dssdev)
+static void nec_8048_panel_power_off(struct omap_dss_device *dssdev)
 {
         struct nec_8048_data *necd = dev_get_drvdata(&dssdev->dev);
         struct backlight_device *bl = necd->bl;
 
-        omapdss_dpi_display_disable(dssdev);
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                return;
 
         bl->props.brightness = 0;
         nec_8048_bl_update_status(bl);
 
         if (dssdev->platform_disable)
                 dssdev->platform_disable(dssdev);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int nec_8048_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = nec_8048_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void nec_8048_panel_disable(struct omap_dss_device *dssdev)
+{
+        nec_8048_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
 static int nec_8048_panel_suspend(struct omap_dss_device *dssdev)
 {
-        nec_8048_panel_disable(dssdev);
+        nec_8048_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
         return 0;
 }
 
 static int nec_8048_panel_resume(struct omap_dss_device *dssdev)
 {
-        return nec_8048_panel_enable(dssdev);
+        int r;
+
+        r = nec_8048_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
 }
 
 static int nec_8048_recommended_bpp(struct omap_dss_device *dssdev)
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 80c3f6ab1a94..00c5c615585f 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -198,12 +198,6 @@ struct taal_data {
         bool te_enabled;
 
         atomic_t do_update;
-        struct {
-                u16 x;
-                u16 y;
-                u16 w;
-                u16 h;
-        } update_region;
         int channel;
 
         struct delayed_work te_timeout_work;
@@ -1188,6 +1182,10 @@ static int taal_power_on(struct omap_dss_device *dssdev)
         if (r)
                 goto err;
 
+        r = dsi_enable_video_output(dssdev, td->channel);
+        if (r)
+                goto err;
+
         td->enabled = 1;
 
         if (!td->intro_printed) {
@@ -1217,6 +1215,8 @@ static void taal_power_off(struct omap_dss_device *dssdev)
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         int r;
 
+        dsi_disable_video_output(dssdev, td->channel);
+
         r = taal_dcs_write_0(td, MIPI_DCS_SET_DISPLAY_OFF);
         if (!r)
                 r = taal_sleep_in(td);
@@ -1394,12 +1394,8 @@ static irqreturn_t taal_te_isr(int irq, void *data)
         if (old) {
                 cancel_delayed_work(&td->te_timeout_work);
 
-                r = omap_dsi_update(dssdev, td->channel,
-                                td->update_region.x,
-                                td->update_region.y,
-                                td->update_region.w,
-                                td->update_region.h,
-                                taal_framedone_cb, dssdev);
+                r = omap_dsi_update(dssdev, td->channel, taal_framedone_cb,
+                                dssdev);
                 if (r)
                         goto err;
         }
@@ -1444,26 +1440,20 @@ static int taal_update(struct omap_dss_device *dssdev,
                 goto err;
         }
 
-        r = omap_dsi_prepare_update(dssdev, &x, &y, &w, &h, true);
-        if (r)
-                goto err;
-
-        r = taal_set_update_window(td, x, y, w, h);
+        /* XXX no need to send this every frame, but dsi break if not done */
+        r = taal_set_update_window(td, 0, 0,
+                        td->panel_config->timings.x_res,
+                        td->panel_config->timings.y_res);
         if (r)
                 goto err;
 
         if (td->te_enabled && panel_data->use_ext_te) {
-                td->update_region.x = x;
-                td->update_region.y = y;
-                td->update_region.w = w;
-                td->update_region.h = h;
-                barrier();
                 schedule_delayed_work(&td->te_timeout_work,
                                 msecs_to_jiffies(250));
                 atomic_set(&td->do_update, 1);
         } else {
-                r = omap_dsi_update(dssdev, td->channel, x, y, w, h,
-                                taal_framedone_cb, dssdev);
+                r = omap_dsi_update(dssdev, td->channel, taal_framedone_cb,
+                                dssdev);
                 if (r)
                         goto err;
         }