diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_connector.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_connector.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c index 912759daf562..86f4ead0441d 100644 --- a/drivers/gpu/drm/omapdrm/omap_connector.c +++ b/drivers/gpu/drm/omapdrm/omap_connector.c | |||
@@ -37,7 +37,7 @@ struct omap_connector { | |||
37 | void copy_timings_omap_to_drm(struct drm_display_mode *mode, | 37 | void copy_timings_omap_to_drm(struct drm_display_mode *mode, |
38 | struct omap_video_timings *timings) | 38 | struct omap_video_timings *timings) |
39 | { | 39 | { |
40 | mode->clock = timings->pixel_clock; | 40 | mode->clock = timings->pixelclock / 1000; |
41 | 41 | ||
42 | mode->hdisplay = timings->x_res; | 42 | mode->hdisplay = timings->x_res; |
43 | mode->hsync_start = mode->hdisplay + timings->hfp; | 43 | mode->hsync_start = mode->hdisplay + timings->hfp; |
@@ -68,7 +68,7 @@ void copy_timings_omap_to_drm(struct drm_display_mode *mode, | |||
68 | void copy_timings_drm_to_omap(struct omap_video_timings *timings, | 68 | void copy_timings_drm_to_omap(struct omap_video_timings *timings, |
69 | struct drm_display_mode *mode) | 69 | struct drm_display_mode *mode) |
70 | { | 70 | { |
71 | timings->pixel_clock = mode->clock; | 71 | timings->pixelclock = mode->clock * 1000; |
72 | 72 | ||
73 | timings->x_res = mode->hdisplay; | 73 | timings->x_res = mode->hdisplay; |
74 | timings->hfp = mode->hsync_start - mode->hdisplay; | 74 | timings->hfp = mode->hsync_start - mode->hdisplay; |
@@ -220,7 +220,7 @@ static int omap_connector_mode_valid(struct drm_connector *connector, | |||
220 | if (!r) { | 220 | if (!r) { |
221 | /* check if vrefresh is still valid */ | 221 | /* check if vrefresh is still valid */ |
222 | new_mode = drm_mode_duplicate(dev, mode); | 222 | new_mode = drm_mode_duplicate(dev, mode); |
223 | new_mode->clock = timings.pixel_clock; | 223 | new_mode->clock = timings.pixelclock / 1000; |
224 | new_mode->vrefresh = 0; | 224 | new_mode->vrefresh = 0; |
225 | if (mode->vrefresh == drm_mode_vrefresh(new_mode)) | 225 | if (mode->vrefresh == drm_mode_vrefresh(new_mode)) |
226 | ret = MODE_OK; | 226 | ret = MODE_OK; |