OMAPDSS: DPI: Maintain our own timings field in driver data

The DPI driver currently relies on the timings in omap_dss_device struct to
configure the DISPC accordingly. This makes the DPI interface driver dependent
on the omap_dss_device struct.

Make the DPI driver data maintain it's own timings field. The panel driver is
expected to call dpi_set_timings()(renamed to omapdss_dpi_set_timings) to set
these timings before the panel is enabled.

In the set_timings() op, we still ensure that the omap_dss_device timings
(dssdev->panel.timings) are configured. This will later be configured only by
the DPI panel drivers.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 69e78a55283a6895b0f192e54e1a38feda54f4c4..8d4e102bb0e616692e9b48b36982fdc90e2de26f 100644 (file)
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -565,6 +565,8 @@ static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;
@@ -726,7 +728,7 @@ static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
 
        mutex_lock(&drv_data->lock);
 
-       dpi_set_timings(dssdev, timings);
+       omapdss_dpi_set_timings(dssdev, timings);
 
        mutex_unlock(&drv_data->lock);
 }

diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index 802807798846a3ff976019784b51158f16df4b66..7e52aee36f4fd2d663b7ee1b004eec583e75220f 100644 (file)
--- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
@@ -55,6 +55,8 @@ static int lb035q02_panel_power_on(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;

diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index b122b0f31c43b34602a0f8215ca8106819ea3512..e501c401ccb037996a07b38f711c7696f0a93b7f 100644 (file)
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -175,6 +175,8 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;

diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
index 2d35bd388860001c08ddbaf5cc1a551764a2f5a5..0d7a8ff50f1665cd874d50266184fafc738a898d 100644 (file)
--- a/drivers/video/omap2/displays/panel-picodlp.c
+++ b/drivers/video/omap2/displays/panel-picodlp.c
@@ -377,6 +377,9 @@ static int picodlp_panel_power_on(struct omap_dss_device *dssdev)
         * then only i2c commands can be successfully sent to dpp2600
         */
        msleep(1000);
+
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r) {
                dev_err(&dssdev->dev, "failed to enable DPI\n");

diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index bd86ba9ccf7600bed53c29c257e164c7dda763ec..1486a81fc8b608ee52fa4d4ecb8fd7c03324382c 100644 (file)
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -142,6 +142,8 @@ static int sharp_ls_power_on(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;

diff --git a/drivers/video/omap2/displays/panel-tfp410.c b/drivers/video/omap2/displays/panel-tfp410.c
index 40cc0cfa5d179c77ce8c4bcf0282391162140766..c6f950321f210c23c73dba250e0e59c5b5df3de2 100644 (file)
--- a/drivers/video/omap2/displays/panel-tfp410.c
+++ b/drivers/video/omap2/displays/panel-tfp410.c
@@ -65,6 +65,8 @@ static int tfp410_power_on(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;
@@ -231,7 +233,7 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev,
        struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
 
        mutex_lock(&ddata->lock);
-       dpi_set_timings(dssdev, timings);
+       omapdss_dpi_set_timings(dssdev, timings);
        mutex_unlock(&ddata->lock);
 }
 

diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index fa7baa650ae06bcc18a911a3e3fed34cb4e6f0b2..ecb163e4cfafe1fed5ecf8e8ce9faed5a1ae094c 100644 (file)
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -337,6 +337,8 @@ static int tpo_td043_enable_dss(struct omap_dss_device *dssdev)
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
 
+       omapdss_dpi_set_timings(dssdev, &dssdev->panel.timings);
+
        r = omapdss_dpi_display_enable(dssdev);
        if (r)
                goto err0;
@@ -480,7 +482,7 @@ static void tpo_td043_remove(struct omap_dss_device *dssdev)
 static void tpo_td043_set_timings(struct omap_dss_device *dssdev,
                struct omap_video_timings *timings)
 {
-       dpi_set_timings(dssdev, timings);
+       omapdss_dpi_set_timings(dssdev, timings);
 }
 
 static int tpo_td043_check_timings(struct omap_dss_device *dssdev,

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 15c2c3301f48eb15297a3c1fff40a315a72b08da..97c7a10bc9ff70e6688b307b050a7bd2ed2a7f33 100644 (file)
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -41,6 +41,7 @@ static struct {
 
        struct mutex lock;
 
+       struct omap_video_timings timings;
        struct dss_lcd_mgr_config mgr_config;
 } dpi;
 
@@ -123,7 +124,7 @@ static int dpi_set_dispc_clk(struct omap_dss_device *dssdev,
 
 static int dpi_set_mode(struct omap_dss_device *dssdev)
 {
-       struct omap_video_timings *t = &dssdev->panel.timings;
+       struct omap_video_timings *t = &dpi.timings;
        int lck_div = 0, pck_div = 0;
        unsigned long fck = 0;
        unsigned long pck;
@@ -272,8 +273,8 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
 }
 EXPORT_SYMBOL(omapdss_dpi_display_disable);
 
-void dpi_set_timings(struct omap_dss_device *dssdev,
-                       struct omap_video_timings *timings)
+void omapdss_dpi_set_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
 {
        int r;
 
@@ -281,7 +282,9 @@ void dpi_set_timings(struct omap_dss_device *dssdev,
 
        mutex_lock(&dpi.lock);
 
+       dpi.timings = *timings;
        dssdev->panel.timings = *timings;
+
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
                r = dispc_runtime_get();
                if (r)
@@ -296,7 +299,7 @@ void dpi_set_timings(struct omap_dss_device *dssdev,
 
        mutex_unlock(&dpi.lock);
 }
-EXPORT_SYMBOL(dpi_set_timings);
+EXPORT_SYMBOL(omapdss_dpi_set_timings);
 
 int dpi_check_timings(struct omap_dss_device *dssdev,
                        struct omap_video_timings *timings)

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index a6267a2d292bfa07a815003410060348656392ce..be2cb6b7fba5bb18c6f1403997a60f10833d01ae 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -734,8 +734,8 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,
 
 int omapdss_dpi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_dpi_display_disable(struct omap_dss_device *dssdev);
-void dpi_set_timings(struct omap_dss_device *dssdev,
-                       struct omap_video_timings *timings);
+void omapdss_dpi_set_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings);
 int dpi_check_timings(struct omap_dss_device *dssdev,
                        struct omap_video_timings *timings);