lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 15/23] drm/omap: omap_display_timings: Use display_flags for pixel data edge
    Date
    In preparation to move the stack to use the generic videmode struct for
    display timing information use display_flags for pixel data edge.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    ---
    drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 3 +--
    drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 3 +--
    .../gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 3 +--
    drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 3 +--
    .../gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 3 +--
    drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 3 +--
    drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 +--
    drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 3 +--
    drivers/gpu/drm/omapdrm/dss/dispc.c | 16 +++++-----------
    drivers/gpu/drm/omapdrm/dss/display.c | 9 +--------
    drivers/gpu/drm/omapdrm/dss/dsi.c | 3 ++-
    drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 --
    drivers/gpu/drm/omapdrm/dss/rfbi.c | 3 ++-
    drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +-
    drivers/gpu/drm/omapdrm/dss/venc.c | 8 ++++----
    drivers/gpu/drm/omapdrm/omap_connector.c | 3 +--
    16 files changed, 24 insertions(+), 46 deletions(-)

    diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
    index b94bfca0ecae..6f130862db8a 100644
    --- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
    +++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
    @@ -33,11 +33,10 @@ static const struct omap_video_timings dvic_default_timings = {
    .vsync_len = 4,
    .vback_porch = 7,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };

    struct panel_drv_data {
    diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
    index e3b8dddc90bd..eec079e017f0 100644
    --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
    +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
    @@ -115,9 +115,8 @@ static void tfp410_disable(struct omap_dss_device *dssdev)

    static void tfp410_fix_timings(struct omap_video_timings *timings)
    {
    - timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
    timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
    - timings->flags |= DISPLAY_FLAGS_DE_HIGH;
    + timings->flags |= DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE;
    }

    static void tfp410_set_timings(struct omap_dss_device *dssdev,
    diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
    index 7d4c59bf1950..33cdc107ed21 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
    @@ -33,11 +33,10 @@ static struct omap_video_timings lb035q02_timings = {
    .vfront_porch = 4,
    .vback_porch = 18,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };

    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 f0edb4ece16d..475420239b40 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
    @@ -77,11 +77,10 @@ static const struct omap_video_timings nec_8048_panel_timings = {
    .vsync_len = 1,
    .vback_porch = 4,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };

    #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 a18dd7160df0..fb7e032209bd 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
    @@ -49,11 +49,10 @@ static const struct omap_video_timings sharp_ls_timings = {
    .vfront_porch = 1,
    .vback_porch = 1,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };

    #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 fd9d5282319c..ea6d59d8e41e 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
    @@ -104,11 +104,10 @@ static const struct omap_video_timings acx565akm_panel_timings = {
    .vsync_len = 3,
    .vback_porch = 4,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };

    #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 8570ad5aeb55..717b4577ac49 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
    @@ -53,11 +53,10 @@ static struct omap_video_timings td028ttec1_panel_timings = {
    .vsync_len = 2,
    .vback_porch = 2,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_NEGEDGE,
    };

    #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 03497708c4c9..71fa7aabd062 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
    @@ -86,11 +86,10 @@ static const struct omap_video_timings tpo_td043_timings = {
    .vfront_porch = 39,
    .vback_porch = 34,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_NEGEDGE,
    };

    #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 3d5262422d88..a68fe59f250d 100644
    --- a/drivers/gpu/drm/omapdrm/dss/dispc.c
    +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
    @@ -3172,16 +3172,10 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel,
    else
    de = true;

    - switch (ovt->data_pclk_edge) {
    - case OMAPDSS_DRIVE_SIG_RISING_EDGE:
    + if (ovt->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
    ipc = false;
    - break;
    - case OMAPDSS_DRIVE_SIG_FALLING_EDGE:
    + else
    ipc = true;
    - break;
    - default:
    - BUG();
    - }

    /* always use the 'rf' setting */
    onoff = true;
    @@ -3261,7 +3255,8 @@ void dispc_mgr_set_timings(enum omap_channel channel,
    DSSDBG("vsync_level %d hsync_level %d data_pclk_edge %d de_level %d sync_pclk_edge %d\n",
    !!(t.flags & DISPLAY_FLAGS_VSYNC_HIGH),
    !!(t.flags & DISPLAY_FLAGS_HSYNC_HIGH),
    - t.data_pclk_edge, !!(t.flags & DISPLAY_FLAGS_DE_HIGH),
    + !!(t.flags & DISPLAY_FLAGS_PIXDATA_POSEDGE),
    + !!(t.flags & DISPLAY_FLAGS_DE_HIGH),
    t.sync_pclk_edge);

    DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
    @@ -4205,11 +4200,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,
    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,

    .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
    - DISPLAY_FLAGS_DE_HIGH,
    + DISPLAY_FLAGS_DE_HIGH | 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 8d2fcb705ae8..1cd503cc95fe 100644
    --- a/drivers/gpu/drm/omapdrm/dss/display.c
    +++ b/drivers/gpu/drm/omapdrm/dss/display.c
    @@ -234,11 +234,9 @@ void videomode_to_omap_video_timings(const struct videomode *vm,
    ovt->vsync_len = vm->vsync_len;
    ovt->flags = vm->flags;

    - ovt->data_pclk_edge = vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE ?
    + ovt->sync_pclk_edge = ovt->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE ?
    OMAPDSS_DRIVE_SIG_RISING_EDGE :
    OMAPDSS_DRIVE_SIG_FALLING_EDGE;
    -
    - ovt->sync_pclk_edge = ovt->data_pclk_edge;
    }
    EXPORT_SYMBOL(videomode_to_omap_video_timings);

    @@ -258,10 +256,5 @@ void omap_video_timings_to_videomode(const struct omap_video_timings *ovt,
    vm->vfront_porch = ovt->vfront_porch;
    vm->vsync_len = ovt->vsync_len;
    vm->flags = ovt->flags;
    -
    - if (ovt->data_pclk_edge == OMAPDSS_DRIVE_SIG_RISING_EDGE)
    - vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
    - else
    - vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
    }
    EXPORT_SYMBOL(omap_video_timings_to_videomode);
    diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
    index 62ffc654737c..6866341396fb 100644
    --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
    +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
    @@ -4127,7 +4127,8 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
    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.flags &= ~DISPLAY_FLAGS_PIXDATA_NEGEDGE;
    + 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;
    diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
    index 342993154d6d..1bc186110106 100644
    --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
    +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
    @@ -319,8 +319,6 @@ struct omap_video_timings {
    /* Unit: line clocks */
    u16 vback_porch; /* Vertical back porch */

    - /* Pixel clock edge to drive LCD data */
    - enum omap_dss_signal_edge data_pclk_edge;
    /* Pixel clock edges to drive HSYNC and VSYNC signals */
    enum omap_dss_signal_edge sync_pclk_edge;

    diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
    index 449d6aafb71f..7a9598e93bc9 100644
    --- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
    +++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
    @@ -870,7 +870,8 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
    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.flags &= ~DISPLAY_FLAGS_PIXDATA_NEGEDGE;
    + 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;
    diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
    index 0a96c321ce62..a886f9051b33 100644
    --- a/drivers/gpu/drm/omapdrm/dss/sdi.c
    +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
    @@ -151,7 +151,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
    goto err_get_dispc;

    /* 15.5.9.1.2 */
    - t->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
    + t->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
    t->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;

    r = sdi_calc_clock_div(t->pixelclock, &fck, &dispc_cinfo);
    diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
    index 8657e3c09e32..82d0cda9a499 100644
    --- a/drivers/gpu/drm/omapdrm/dss/venc.c
    +++ b/drivers/gpu/drm/omapdrm/dss/venc.c
    @@ -273,11 +273,11 @@ const struct omap_video_timings omap_dss_pal_timings = {
    .vfront_porch = 5,
    .vback_porch = 41,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .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_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH |
    + DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };
    EXPORT_SYMBOL(omap_dss_pal_timings);

    @@ -292,11 +292,11 @@ const struct omap_video_timings omap_dss_ntsc_timings = {
    .vfront_porch = 6,
    .vback_porch = 31,

    - .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
    .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_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH |
    + DISPLAY_FLAGS_PIXDATA_POSEDGE,
    };
    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 f3e9bcf1f784..5fa15da78a8c 100644
    --- a/drivers/gpu/drm/omapdrm/omap_connector.c
    +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
    @@ -107,8 +107,7 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
    else
    timings->flags |= DISPLAY_FLAGS_VSYNC_LOW;

    - timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
    - timings->flags |= DISPLAY_FLAGS_DE_HIGH;
    + timings->flags |= DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE;
    timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
    }

    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-23 00:02    [W:4.885 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site