From b9abaa4c5a771796a397ffdaa5c06f288cba0f41 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 12 Aug 2009 02:30:09 +0200
Subject: [PATCH] --- yaml --- r: 163913 b: refs/heads/master c:
 841b4117b30d544690fceb952037b1cddf14783f h: refs/heads/master i:   163911:
 fcc16acbc17fb3bd3b0cc62920b9e524be2a8356 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/gpu/drm/drm_modes.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ebbed71cbe1e..f78f49d32fc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b7902e54c7e8abbc213d8bdc290350c00ccfe5
+refs/heads/master: 841b4117b30d544690fceb952037b1cddf14783f
diff --git a/trunk/drivers/gpu/drm/drm_modes.c b/trunk/drivers/gpu/drm/drm_modes.c
index 6b4d2dc3cdd9..9e54925a7609 100644
--- a/trunk/drivers/gpu/drm/drm_modes.c
+++ b/trunk/drivers/gpu/drm/drm_modes.c
@@ -146,7 +146,7 @@ struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay,
 	if (margins)
 		vmargin = vdisplay_rnd * CVT_MARGIN_PERCENTAGE / 1000;
 
-	drm_mode->vdisplay = vdisplay_rnd + 2 * vmargin;
+	drm_mode->vdisplay = vdisplay + 2 * vmargin;
 
 	/* Interlaced */
 	if (interlaced)