mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
drm/omap: omap_display_timings: Use display_flags for DE level
In preparation to move the stack to use the generic videmode struct for display timing information use display_flags for DE level. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
6b44cd2748
commit
3fa3ab4a88
15 changed files with 29 additions and 44 deletions
|
@ -34,10 +34,10 @@ static const struct omap_video_timings dvic_default_timings = {
|
|||
.vback_porch = 7,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
struct panel_drv_data {
|
||||
|
|
|
@ -117,7 +117,7 @@ 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->de_level = OMAPDSS_SIG_ACTIVE_HIGH;
|
||||
timings->flags |= DISPLAY_FLAGS_DE_HIGH;
|
||||
}
|
||||
|
||||
static void tfp410_set_timings(struct omap_dss_device *dssdev,
|
||||
|
|
|
@ -34,10 +34,10 @@ static struct omap_video_timings lb035q02_timings = {
|
|||
.vback_porch = 18,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
struct panel_drv_data {
|
||||
|
|
|
@ -77,10 +77,10 @@ static const struct omap_video_timings nec_8048_panel_timings = {
|
|||
.vback_porch = 4,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
|
||||
|
|
|
@ -50,10 +50,10 @@ static const struct omap_video_timings sharp_ls_timings = {
|
|||
.vback_porch = 1,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
|
||||
|
|
|
@ -104,10 +104,10 @@ static const struct omap_video_timings acx565akm_panel_timings = {
|
|||
.vback_porch = 4,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
|
||||
|
|
|
@ -54,10 +54,10 @@ static struct omap_video_timings td028ttec1_panel_timings = {
|
|||
.vback_porch = 2,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
#define JBT_COMMAND 0x000
|
||||
|
|
|
@ -87,10 +87,10 @@ static const struct omap_video_timings tpo_td043_timings = {
|
|||
.vback_porch = 34,
|
||||
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
|
||||
|
|
|
@ -3167,16 +3167,10 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel,
|
|||
else
|
||||
hs = true;
|
||||
|
||||
switch (ovt->de_level) {
|
||||
case OMAPDSS_SIG_ACTIVE_LOW:
|
||||
de = true;
|
||||
break;
|
||||
case OMAPDSS_SIG_ACTIVE_HIGH:
|
||||
if (ovt->flags & DISPLAY_FLAGS_DE_HIGH)
|
||||
de = false;
|
||||
break;
|
||||
default:
|
||||
BUG();
|
||||
}
|
||||
else
|
||||
de = true;
|
||||
|
||||
switch (ovt->data_pclk_edge) {
|
||||
case OMAPDSS_DRIVE_SIG_RISING_EDGE:
|
||||
|
@ -3267,7 +3261,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.de_level, t.sync_pclk_edge);
|
||||
t.data_pclk_edge, !!(t.flags & DISPLAY_FLAGS_DE_HIGH),
|
||||
t.sync_pclk_edge);
|
||||
|
||||
DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
|
||||
} else {
|
||||
|
@ -4210,11 +4205,11 @@ static const struct dispc_errata_i734_data {
|
|||
.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,
|
||||
.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,
|
||||
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
|
||||
DISPLAY_FLAGS_DE_HIGH,
|
||||
},
|
||||
.ovli = {
|
||||
.screen_width = 1,
|
||||
|
|
|
@ -234,9 +234,6 @@ void videomode_to_omap_video_timings(const struct videomode *vm,
|
|||
ovt->vsync_len = vm->vsync_len;
|
||||
ovt->flags = vm->flags;
|
||||
|
||||
ovt->de_level = vm->flags & DISPLAY_FLAGS_DE_HIGH ?
|
||||
OMAPDSS_SIG_ACTIVE_HIGH :
|
||||
OMAPDSS_SIG_ACTIVE_LOW;
|
||||
ovt->data_pclk_edge = vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE ?
|
||||
OMAPDSS_DRIVE_SIG_RISING_EDGE :
|
||||
OMAPDSS_DRIVE_SIG_FALLING_EDGE;
|
||||
|
@ -262,11 +259,6 @@ void omap_video_timings_to_videomode(const struct omap_video_timings *ovt,
|
|||
vm->vsync_len = ovt->vsync_len;
|
||||
vm->flags = ovt->flags;
|
||||
|
||||
if (ovt->de_level == OMAPDSS_SIG_ACTIVE_HIGH)
|
||||
vm->flags |= DISPLAY_FLAGS_DE_HIGH;
|
||||
else
|
||||
vm->flags |= DISPLAY_FLAGS_DE_LOW;
|
||||
|
||||
if (ovt->data_pclk_edge == OMAPDSS_DRIVE_SIG_RISING_EDGE)
|
||||
vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
|
||||
else
|
||||
|
|
|
@ -4128,7 +4128,8 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
|
|||
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.flags &= ~DISPLAY_FLAGS_DE_LOW;
|
||||
dsi->timings.flags |= DISPLAY_FLAGS_DE_HIGH;
|
||||
dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
|
||||
|
||||
dss_mgr_set_timings(channel, &dsi->timings);
|
||||
|
|
|
@ -321,8 +321,6 @@ struct omap_video_timings {
|
|||
|
||||
/* Pixel clock edge to drive LCD data */
|
||||
enum omap_dss_signal_edge data_pclk_edge;
|
||||
/* Data enable logic level */
|
||||
enum omap_dss_signal_level de_level;
|
||||
/* Pixel clock edges to drive HSYNC and VSYNC signals */
|
||||
enum omap_dss_signal_edge sync_pclk_edge;
|
||||
|
||||
|
|
|
@ -871,7 +871,8 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
|
|||
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.flags &= ~DISPLAY_FLAGS_DE_LOW;
|
||||
rfbi.timings.flags |= DISPLAY_FLAGS_DE_HIGH;
|
||||
rfbi.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
|
||||
|
||||
dss_mgr_set_timings(mgr, &rfbi.timings);
|
||||
|
|
|
@ -274,11 +274,10 @@ const struct omap_video_timings omap_dss_pal_timings = {
|
|||
.vback_porch = 41,
|
||||
|
||||
.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 | DISPLAY_FLAGS_HSYNC_LOW |
|
||||
DISPLAY_FLAGS_VSYNC_LOW,
|
||||
DISPLAY_FLAGS_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
EXPORT_SYMBOL(omap_dss_pal_timings);
|
||||
|
||||
|
@ -294,11 +293,10 @@ const struct omap_video_timings omap_dss_ntsc_timings = {
|
|||
.vback_porch = 31,
|
||||
|
||||
.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 | DISPLAY_FLAGS_HSYNC_LOW |
|
||||
DISPLAY_FLAGS_VSYNC_LOW,
|
||||
DISPLAY_FLAGS_VSYNC_LOW | DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
EXPORT_SYMBOL(omap_dss_ntsc_timings);
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
|
|||
timings->flags |= DISPLAY_FLAGS_VSYNC_LOW;
|
||||
|
||||
timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
|
||||
timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;
|
||||
timings->flags |= DISPLAY_FLAGS_DE_HIGH;
|
||||
timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue