drm/omap: omap_display_timings: Use display_flags for h/vsync level

In preparation to move the stack to use the generic videmode struct for
display timing information use display_flags for h/vsync level.

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

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 0a74914278326f1a9808c8f1c7ae90e4255afbec..264182f97194866038dacec9aefeb30d78dc094e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -40,7 +40,8 @@ static const struct omap_video_timings tvc_pal_timings = {
        .vfront_porch   = 5,
        .vback_porch    = 41,
 
-       .flags          = DISPLAY_FLAGS_INTERLACED,
+       .flags          = DISPLAY_FLAGS_INTERLACED | DISPLAY_FLAGS_HSYNC_LOW |
+                         DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 static const struct of_device_id tvc_of_match[];

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index adbcd566a7eccf8ad4b2d38ccf18ea1391901ce7..b81c366ba63a67ab93ef4db9a3d89c5c0c5d845c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -33,11 +33,11 @@ static const struct omap_video_timings dvic_default_timings = {
        .vsync_len      = 4,
        .vback_porch    = 7,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_HIGH,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_HIGH,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH,
 };
 
 struct panel_drv_data {

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 8e246b9142d71f139c3175e9c3cf62ad156410e4..f9809f4eb39058b903252c82b5679dc3abcf50b9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -32,8 +32,7 @@ static const struct omap_video_timings hdmic_default_timings = {
        .vfront_porch   = 11,
        .vback_porch    = 31,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 struct panel_drv_data {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 9c114da37a6bf895ceb79fdfa898faa0f6b77971..999dec6c2cffbb8c1d901929617b6b89609ebaae 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -33,11 +33,11 @@ static struct omap_video_timings lb035q02_timings = {
        .vfront_porch   = 4,
        .vback_porch    = 18,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 struct panel_drv_data {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 1e1acc6e06cba5e94dcae763f69004639bcb31ac..c45eb3520346ca52254a7777b96c87d6e532fae8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -76,11 +76,11 @@ static const struct omap_video_timings nec_8048_panel_timings = {
        .vsync_len      = 1,
        .vback_porch    = 4,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 79cb8bde1cca37877c326cb06260651621fd9df3..a83e6a1b894bdedda0879e64332c81f10deffef9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -49,11 +49,11 @@ static const struct omap_video_timings sharp_ls_timings = {
        .vfront_porch   = 1,
        .vback_porch    = 1,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index 30d689818518d368d232b445b59dc18935bb2504..40c882599c96970f40e2885f0f9db4d93cd9d11a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -103,12 +103,11 @@ static const struct omap_video_timings acx565akm_panel_timings = {
        .vsync_len      = 3,
        .vback_porch    = 4,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index a367b615d8086a4ea4890ddd2d19072b747179c5..d98a16e8ce4a7ac20b41604a912a765bf60ed835 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -53,12 +53,11 @@ static struct omap_video_timings td028ttec1_panel_timings = {
        .vsync_len      = 2,
        .vback_porch    = 2,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define JBT_COMMAND    0x000

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 16d24381b270d1e5d98589c58652fe3ba42faf5e..65eeda51dbef4be4d847d69b09d8b77fdde3064a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -86,11 +86,11 @@ static const struct omap_video_timings tpo_td043_timings = {
        .vfront_porch   = 39,
        .vback_porch    = 34,
 
-       .vsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
-       .hsync_level    = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 6a0c13d97cc11ef8d22a1fff19487fd1005f1292..6acdd21941227632c3c19b3024c51e71bee5bd6a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -3157,27 +3157,15 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel,
        dispc_write_reg(DISPC_TIMING_H(channel), timing_h);
        dispc_write_reg(DISPC_TIMING_V(channel), timing_v);
 
-       switch (ovt->vsync_level) {
-       case OMAPDSS_SIG_ACTIVE_LOW:
-               vs = true;
-               break;
-       case OMAPDSS_SIG_ACTIVE_HIGH:
+       if (ovt->flags & DISPLAY_FLAGS_VSYNC_HIGH)
                vs = false;
-               break;
-       default:
-               BUG();
-       }
+       else
+               vs = true;
 
-       switch (ovt->hsync_level) {
-       case OMAPDSS_SIG_ACTIVE_LOW:
-               hs = true;
-               break;
-       case OMAPDSS_SIG_ACTIVE_HIGH:
+       if (ovt->flags & DISPLAY_FLAGS_HSYNC_HIGH)
                hs = false;
-               break;
-       default:
-               BUG();
-       }
+       else
+               hs = true;
 
        switch (ovt->de_level) {
        case OMAPDSS_SIG_ACTIVE_LOW:
@@ -3277,8 +3265,9 @@ void dispc_mgr_set_timings(enum omap_channel channel,
                        t.hsync_len, t.hfront_porch, t.hback_porch,
                        t.vsync_len, t.vfront_porch, t.vback_porch);
                DSSDBG("vsync_level %d hsync_level %d data_pclk_edge %d de_level %d sync_pclk_edge %d\n",
-                       t.vsync_level, t.hsync_level, t.data_pclk_edge,
-                       t.de_level, t.sync_pclk_edge);
+                       !!(t.flags & DISPLAY_FLAGS_VSYNC_HIGH),
+                       !!(t.flags & DISPLAY_FLAGS_HSYNC_HIGH),
+                       t.data_pclk_edge, t.de_level, t.sync_pclk_edge);
 
                DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
        } else {
@@ -4220,12 +4209,12 @@ 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,
-               .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
-               .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
                .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
                .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
                .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
                .double_pixel = false,
+
+               .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
        },
        .ovli = {
                .screen_width = 1,

diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index d63ea2d5d8125d4e274f4cfa67303fd4ecb0e009..ddb5bbd41dfbf7deb189c0a11743da6ac60b6865 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -232,13 +232,8 @@ void videomode_to_omap_video_timings(const struct videomode *vm,
        ovt->vback_porch = vm->vback_porch;
        ovt->vfront_porch = vm->vfront_porch;
        ovt->vsync_len = vm->vsync_len;
+       ovt->flags = vm->flags;
 
-       ovt->vsync_level = vm->flags & DISPLAY_FLAGS_VSYNC_HIGH ?
-               OMAPDSS_SIG_ACTIVE_HIGH :
-               OMAPDSS_SIG_ACTIVE_LOW;
-       ovt->hsync_level = vm->flags & DISPLAY_FLAGS_HSYNC_HIGH ?
-               OMAPDSS_SIG_ACTIVE_HIGH :
-               OMAPDSS_SIG_ACTIVE_LOW;
        ovt->de_level = vm->flags & DISPLAY_FLAGS_DE_HIGH ?
                OMAPDSS_SIG_ACTIVE_HIGH :
                OMAPDSS_SIG_ACTIVE_LOW;
@@ -265,16 +260,7 @@ void omap_video_timings_to_videomode(const struct omap_video_timings *ovt,
        vm->vback_porch = ovt->vback_porch;
        vm->vfront_porch = ovt->vfront_porch;
        vm->vsync_len = ovt->vsync_len;
-
-       if (ovt->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
-               vm->flags |= DISPLAY_FLAGS_HSYNC_HIGH;
-       else
-               vm->flags |= DISPLAY_FLAGS_HSYNC_LOW;
-
-       if (ovt->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
-               vm->flags |= DISPLAY_FLAGS_VSYNC_HIGH;
-       else
-               vm->flags |= DISPLAY_FLAGS_VSYNC_LOW;
+       vm->flags = ovt->flags;
 
        if (ovt->de_level == OMAPDSS_SIG_ACTIVE_HIGH)
                vm->flags |= DISPLAY_FLAGS_DE_HIGH;

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 313c8e24ac84e988a207aef6c03b45d344165c11..fb47e82e4e98e72b31d4f22f66b16e72aa1f6e38 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4123,8 +4123,10 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
         * omap_video_timings with default values
         */
        dsi->timings.flags &= ~DISPLAY_FLAGS_INTERLACED;
-       dsi->timings.hsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
-       dsi->timings.vsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
+       dsi->timings.flags &= ~DISPLAY_FLAGS_HSYNC_LOW;
+       dsi->timings.flags |= DISPLAY_FLAGS_HSYNC_HIGH;
+       dsi->timings.flags &= ~DISPLAY_FLAGS_VSYNC_LOW;
+       dsi->timings.flags |= DISPLAY_FLAGS_VSYNC_HIGH;
        dsi->timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
        dsi->timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
        dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index 62268f8d62c650ddfe96ebdaffc01c237f06e83e..f64f389939d150fc89e4805b68daf77211a394e7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -333,8 +333,8 @@ static void hdmi_core_video_config(struct hdmi_core_data *core,
        unsigned char r = 0;
        bool vsync_pol, hsync_pol;
 
-       vsync_pol = ovt->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH;
-       hsync_pol = ovt->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH;
+       vsync_pol = !!(ovt->flags & DISPLAY_FLAGS_VSYNC_HIGH);
+       hsync_pol = !!(ovt->flags & DISPLAY_FLAGS_HSYNC_HIGH);
 
        /* Set hsync, vsync and data-enable polarity  */
        r = hdmi_read_reg(base, HDMI_CORE_FC_INVIDCONF);

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 231f62ed86ffe81f300b17ca1f219c286e3bd69c..b86e5a357456fd094ac55604f6de018d4514528d 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -150,8 +150,8 @@ void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp,
        bool vsync_pol, hsync_pol;
        DSSDBG("Enter hdmi_wp_video_config_interface\n");
 
-       vsync_pol = timings->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH;
-       hsync_pol = timings->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH;
+       vsync_pol = !!(timings->flags & DISPLAY_FLAGS_VSYNC_HIGH);
+       hsync_pol = !!(timings->flags & DISPLAY_FLAGS_HSYNC_HIGH);
 
        r = hdmi_read_reg(wp->base, HDMI_WP_VIDEO_CFG);
        r = FLD_MOD(r, vsync_pol, 7, 7);
@@ -208,8 +208,6 @@ void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
        timings->vfront_porch = param->timings.vfront_porch;
        timings->vsync_len = param->timings.vsync_len;
 
-       timings->vsync_level = param->timings.vsync_level;
-       timings->hsync_level = param->timings.hsync_level;
        timings->double_pixel = param->timings.double_pixel;
        timings->flags = param->timings.flags;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 23fec72bacaca58ee8f130fb901c4957ff41a50a..23ab45447b0daf4c745c9d432fc03a50e544fa14 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -319,10 +319,6 @@ struct omap_video_timings {
        /* Unit: line clocks */
        u16 vback_porch;        /* Vertical back porch */
 
-       /* Vsync logic level */
-       enum omap_dss_signal_level vsync_level;
-       /* Hsync logic level */
-       enum omap_dss_signal_level hsync_level;
        /* Pixel clock edge to drive LCD data */
        enum omap_dss_signal_edge data_pclk_edge;
        /* Data enable logic level */

diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index d5639a5099c82007a49af122480133b9e2e7e7a2..62f037ebfe6d83b8caa8a3ac928d4b6d69357004 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -866,8 +866,10 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
        rfbi.timings.vback_porch = 0;
 
        rfbi.timings.flags &= ~DISPLAY_FLAGS_INTERLACED;
-       rfbi.timings.hsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
-       rfbi.timings.vsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
+       rfbi.timings.flags &= ~DISPLAY_FLAGS_HSYNC_LOW;
+       rfbi.timings.flags |= DISPLAY_FLAGS_HSYNC_HIGH;
+       rfbi.timings.flags &= ~DISPLAY_FLAGS_VSYNC_LOW;
+       rfbi.timings.flags |= DISPLAY_FLAGS_VSYNC_HIGH;
        rfbi.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
        rfbi.timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
        rfbi.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index e271c75ef632169b5be18a27737964a6d871adce..e80ec809f0c7778362e76271614cf932aeae3d7c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -273,13 +273,12 @@ const struct omap_video_timings omap_dss_pal_timings = {
        .vfront_porch   = 5,
        .vback_porch    = 41,
 
-       .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
-       .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
 
-       .flags          = DISPLAY_FLAGS_INTERLACED,
+       .flags          = DISPLAY_FLAGS_INTERLACED | DISPLAY_FLAGS_HSYNC_LOW |
+                         DISPLAY_FLAGS_VSYNC_LOW,
 };
 EXPORT_SYMBOL(omap_dss_pal_timings);
 
@@ -294,13 +293,12 @@ const struct omap_video_timings omap_dss_ntsc_timings = {
        .vfront_porch   = 6,
        .vback_porch    = 31,
 
-       .hsync_level = OMAPDSS_SIG_ACTIVE_LOW,
-       .vsync_level = OMAPDSS_SIG_ACTIVE_LOW,
        .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
        .de_level = OMAPDSS_SIG_ACTIVE_HIGH,
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
 
-       .flags          = DISPLAY_FLAGS_INTERLACED,
+       .flags          = DISPLAY_FLAGS_INTERLACED | DISPLAY_FLAGS_HSYNC_LOW |
+                         DISPLAY_FLAGS_VSYNC_LOW,
 };
 EXPORT_SYMBOL(omap_dss_ntsc_timings);
 

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 5effce40817fce0232b4fa4846931f174fbac91b..695386256d18745e02a82cc1ac29c9d105be6553 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -65,12 +65,12 @@ void copy_timings_omap_to_drm(struct drm_display_mode *mode,
        if (timings->double_pixel)
                mode->flags |= DRM_MODE_FLAG_DBLCLK;
 
-       if (timings->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
+       if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)
                mode->flags |= DRM_MODE_FLAG_PHSYNC;
        else
                mode->flags |= DRM_MODE_FLAG_NHSYNC;
 
-       if (timings->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
+       if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH)
                mode->flags |= DRM_MODE_FLAG_PVSYNC;
        else
                mode->flags |= DRM_MODE_FLAG_NVSYNC;
@@ -97,14 +97,14 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
        timings->double_pixel = !!(mode->flags & DRM_MODE_FLAG_DBLCLK);
 
        if (mode->flags & DRM_MODE_FLAG_PHSYNC)
-               timings->hsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
+               timings->flags |= DISPLAY_FLAGS_HSYNC_HIGH;
        else
-               timings->hsync_level = OMAPDSS_SIG_ACTIVE_LOW;
+               timings->flags |= DISPLAY_FLAGS_HSYNC_LOW;
 
        if (mode->flags & DRM_MODE_FLAG_PVSYNC)
-               timings->vsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
+               timings->flags |= DISPLAY_FLAGS_VSYNC_HIGH;
        else
-               timings->vsync_level = OMAPDSS_SIG_ACTIVE_LOW;
+               timings->flags |= DISPLAY_FLAGS_VSYNC_LOW;
 
        timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
        timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;