aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_connector.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_connector.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_connector.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 5effce40817f..695386256d18 100644
--- 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,
65 if (timings->double_pixel) 65 if (timings->double_pixel)
66 mode->flags |= DRM_MODE_FLAG_DBLCLK; 66 mode->flags |= DRM_MODE_FLAG_DBLCLK;
67 67
68 if (timings->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH) 68 if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)
69 mode->flags |= DRM_MODE_FLAG_PHSYNC; 69 mode->flags |= DRM_MODE_FLAG_PHSYNC;
70 else 70 else
71 mode->flags |= DRM_MODE_FLAG_NHSYNC; 71 mode->flags |= DRM_MODE_FLAG_NHSYNC;
72 72
73 if (timings->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH) 73 if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH)
74 mode->flags |= DRM_MODE_FLAG_PVSYNC; 74 mode->flags |= DRM_MODE_FLAG_PVSYNC;
75 else 75 else
76 mode->flags |= DRM_MODE_FLAG_NVSYNC; 76 mode->flags |= DRM_MODE_FLAG_NVSYNC;
@@ -97,14 +97,14 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
97 timings->double_pixel = !!(mode->flags & DRM_MODE_FLAG_DBLCLK); 97 timings->double_pixel = !!(mode->flags & DRM_MODE_FLAG_DBLCLK);
98 98
99 if (mode->flags & DRM_MODE_FLAG_PHSYNC) 99 if (mode->flags & DRM_MODE_FLAG_PHSYNC)
100 timings->hsync_level = OMAPDSS_SIG_ACTIVE_HIGH; 100 timings->flags |= DISPLAY_FLAGS_HSYNC_HIGH;
101 else 101 else
102 timings->hsync_level = OMAPDSS_SIG_ACTIVE_LOW; 102 timings->flags |= DISPLAY_FLAGS_HSYNC_LOW;
103 103
104 if (mode->flags & DRM_MODE_FLAG_PVSYNC) 104 if (mode->flags & DRM_MODE_FLAG_PVSYNC)
105 timings->vsync_level = OMAPDSS_SIG_ACTIVE_HIGH; 105 timings->flags |= DISPLAY_FLAGS_VSYNC_HIGH;
106 else 106 else
107 timings->vsync_level = OMAPDSS_SIG_ACTIVE_LOW; 107 timings->flags |= DISPLAY_FLAGS_VSYNC_LOW;
108 108
109 timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; 109 timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
110 timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH; 110 timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;