drm/omap: omap_display_timings: Use display_flags for sync edge

In preparation to move the stack to use the generic videmode struct for
display timing information use display_flags for sync edge.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

7 files changed, 15 insertions, 29 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 6b017e1f9245..83b7a7a2a9e7 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -3180,16 +3180,10 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel,
         /* always use the 'rf' setting */
         onoff = true;
 
-        switch (ovt->sync_pclk_edge) {
-        case OMAPDSS_DRIVE_SIG_FALLING_EDGE:
-                rf = false;
-                break;
-        case OMAPDSS_DRIVE_SIG_RISING_EDGE:
+        if (ovt->flags & DISPLAY_FLAGS_SYNC_POSEDGE)
                 rf = true;
-                break;
-        default:
-                BUG();
-        }
+        else
+                rf = false;
 
         l = FLD_VAL(onoff, 17, 17) |
                 FLD_VAL(rf, 16, 16) |
@@ -3257,7 +3251,7 @@ void dispc_mgr_set_timings(enum omap_channel channel,
                         !!(t.flags & DISPLAY_FLAGS_HSYNC_HIGH),
                         !!(t.flags & DISPLAY_FLAGS_PIXDATA_POSEDGE),
                         !!(t.flags & DISPLAY_FLAGS_DE_HIGH),
-                        t.sync_pclk_edge);
+                        !!(t.flags & DISPLAY_FLAGS_SYNC_POSEDGE));
 
                 DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
         } else {
@@ -4200,10 +4194,10 @@ static const struct dispc_errata_i734_data {
                 .pixelclock = 16000000,
                 .hsync_len = 8, .hfront_porch = 4, .hback_porch = 4,
                 .vsync_len = 1, .vfront_porch = 1, .vback_porch = 1,
-                .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
 
                 .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
+                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_POSEDGE |
+                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
         },
         .ovli = {
                 .screen_width = 1,
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index 1cd503cc95fe..1e19a2c00f8f 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -233,10 +233,6 @@ void videomode_to_omap_video_timings(const struct videomode *vm,
         ovt->vfront_porch = vm->vfront_porch;
         ovt->vsync_len = vm->vsync_len;
         ovt->flags = vm->flags;
-
-        ovt->sync_pclk_edge = ovt->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE ?
-                OMAPDSS_DRIVE_SIG_RISING_EDGE :
-                OMAPDSS_DRIVE_SIG_FALLING_EDGE;
 }
 EXPORT_SYMBOL(videomode_to_omap_video_timings);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index ba3a2da7c80d..1dec7dd38029 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4131,7 +4131,8 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
         dsi->timings.flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
         dsi->timings.flags &= ~DISPLAY_FLAGS_DE_LOW;
         dsi->timings.flags |= DISPLAY_FLAGS_DE_HIGH;
-        dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
+        dsi->timings.flags &= ~DISPLAY_FLAGS_SYNC_POSEDGE;
+        dsi->timings.flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
 
         dss_mgr_set_timings(channel, &dsi->timings);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 1bc186110106..84d34242d5a4 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -319,9 +319,6 @@ struct omap_video_timings {
         /* Unit: line clocks */
         u16 vback_porch;        /* Vertical back porch */
 
-        /* Pixel clock edges to drive HSYNC and VSYNC signals */
-        enum omap_dss_signal_edge sync_pclk_edge;
-
         enum display_flags flags;
 };
 
diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index 7a9598e93bc9..ce431817e781 100644
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -874,7 +874,8 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
         rfbi.timings.flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
         rfbi.timings.flags &= ~DISPLAY_FLAGS_DE_LOW;
         rfbi.timings.flags |= DISPLAY_FLAGS_DE_HIGH;
-        rfbi.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
+        rfbi.timings.flags &= ~DISPLAY_FLAGS_SYNC_POSEDGE;
+        rfbi.timings.flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
 
         dss_mgr_set_timings(mgr, &rfbi.timings);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index a886f9051b33..3b076329a3ac 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -151,8 +151,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
                 goto err_get_dispc;
 
         /* 15.5.9.1.2 */
-        t->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
-        t->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
+        t->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE | DISPLAY_FLAGS_SYNC_POSEDGE;
 
         r = sdi_calc_clock_div(t->pixelclock, &fck, &dispc_cinfo);
         if (r)
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 82d0cda9a499..43f98547e9fc 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -273,11 +273,10 @@ const struct omap_video_timings omap_dss_pal_timings = {
         .vfront_porch   = 5,
         .vback_porch    = 41,
 
-        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
-
         .flags          = DISPLAY_FLAGS_INTERLACED | DISPLAY_FLAGS_HSYNC_LOW |
                           DISPLAY_FLAGS_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH |
-                          DISPLAY_FLAGS_PIXDATA_POSEDGE,
+                          DISPLAY_FLAGS_PIXDATA_POSEDGE |
+                          DISPLAY_FLAGS_SYNC_NEGEDGE,
 };
 EXPORT_SYMBOL(omap_dss_pal_timings);
 
@@ -292,11 +291,10 @@ const struct omap_video_timings omap_dss_ntsc_timings = {
         .vfront_porch   = 6,
         .vback_porch    = 31,
 
-        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
-
         .flags          = DISPLAY_FLAGS_INTERLACED | DISPLAY_FLAGS_HSYNC_LOW |
                           DISPLAY_FLAGS_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH |
-                          DISPLAY_FLAGS_PIXDATA_POSEDGE,
+                          DISPLAY_FLAGS_PIXDATA_POSEDGE |
+                          DISPLAY_FLAGS_SYNC_NEGEDGE,
 };
 EXPORT_SYMBOL(omap_dss_ntsc_timings);