-

From c47f6ccd7b5cf1d5bc51ef7bc40af016f2524ccb Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 30 Sep 2015 15:04:33 -0700
Subject: [PATCH] drm/meson: Add back 1x scaling modes

---
 drivers/gpu/drm/meson/meson_modes.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/meson/meson_modes.c b/drivers/gpu/drm/meson/meson_modes.c
index 2ecd858..768fd3f 100644
--- a/drivers/gpu/drm/meson/meson_modes.c
+++ b/drivers/gpu/drm/meson/meson_modes.c
@@ -94,10 +94,15 @@ static const struct {
 	 * incorrect refresh rates. The original algorithm comes from an Excel
 	 * spreadsheet from 2003, which I really don't want to debug. */
 
+	/* Hack scaler modes */
 	{ CVBS_HACK_MODE_SIZE(720), CVBS_HACK_MODE_SIZE(480),
 	  120, VMODE_480CVBS, MESON_MODES_CVBS },
 	{ CVBS_HACK_MODE_SIZE(720), CVBS_HACK_MODE_SIZE(576),
 	  100, VMODE_576CVBS, MESON_MODES_CVBS },
+
+	/* Normal modes */
+	{ 720, 480, 120, VMODE_480CVBS, MESON_MODES_CVBS },
+	{ 720, 576, 100, VMODE_576CVBS, MESON_MODES_CVBS },
 };
 
 vmode_t drm_mode_to_vmode(const struct drm_display_mode *mode,
-- 
2.4.3