From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Mon, 12 Nov 2018 16:59:48 +0000 (+0200)
Subject: drm/i915/tv: Fix tv mode clocks
X-Git-Tag: v5.1-rc1~117^2~15^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d515282380df8c85ca5ed1cc9699c52ccf00fa18;p=thirdparty%2Flinux.git

drm/i915/tv: Fix tv mode clocks

The oversample clock is always supposed to be either 108 MHz
or 148.5 MHz. Make it so.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181112170000.27531-5-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
---

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 91cb31ff8ff0e..a053bb3460e68 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -635,7 +635,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "480p",
-		.clock		= 107520,
+		.clock		= 108000,
 		.refresh	= 59940,
 		.oversample     = TV_OVERSAMPLE_4X,
 		.component_only = 1,
@@ -659,7 +659,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "576p",
-		.clock		= 107520,
+		.clock		= 108000,
 		.refresh	= 50000,
 		.oversample     = TV_OVERSAMPLE_4X,
 		.component_only = 1,
@@ -683,7 +683,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "720p@60Hz",
-		.clock		= 148800,
+		.clock		= 148500,
 		.refresh	= 60000,
 		.oversample     = TV_OVERSAMPLE_2X,
 		.component_only = 1,
@@ -707,7 +707,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "720p@50Hz",
-		.clock		= 148800,
+		.clock		= 148500,
 		.refresh	= 50000,
 		.oversample     = TV_OVERSAMPLE_2X,
 		.component_only = 1,
@@ -732,7 +732,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "1080i@50Hz",
-		.clock		= 148800,
+		.clock		= 148500,
 		.refresh	= 50000,
 		.oversample     = TV_OVERSAMPLE_2X,
 		.component_only = 1,
@@ -758,7 +758,7 @@ static const struct tv_mode tv_modes[] = {
 	},
 	{
 		.name       = "1080i@60Hz",
-		.clock		= 148800,
+		.clock		= 148500,
 		.refresh	= 60000,
 		.oversample     = TV_OVERSAMPLE_2X,
 		.component_only = 1,
@@ -1113,7 +1113,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,
 static const struct drm_display_mode reported_modes[] = {
 	{
 		.name = "NTSC 480i",
-		.clock = 107520,
+		.clock = 108000,
 		.hdisplay = 1280,
 		.hsync_start = 1368,
 		.hsync_end = 1496,