summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-04-11 16:25:07 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-14 16:17:26 +0300
commita57a22c817fbcb69d41ae517e02933618482f42d (patch)
treefd2e4192313f099f2b1ca4a089e02db1bf22a08d /drivers
parent0925afc9a4851c2592f1d45a17aeb7e1ffe188b7 (diff)
downloadlinux-stable-a57a22c817fbcb69d41ae517e02933618482f42d.tar.gz
linux-stable-a57a22c817fbcb69d41ae517e02933618482f42d.tar.bz2
linux-stable-a57a22c817fbcb69d41ae517e02933618482f42d.zip
OMAPDSS: Take pixelclock unit change into account in hdmi_compute_acr()
Pixelclock unit change from kHz to Hz should be taken into account in CTS value calculations in hdmi_compute_acr(). Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/hdmi_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/hdmi_common.c b/drivers/video/omap2/dss/hdmi_common.c
index b11afac8e068..0b12a3f62fe1 100644
--- a/drivers/video/omap2/dss/hdmi_common.c
+++ b/drivers/video/omap2/dss/hdmi_common.c
@@ -347,17 +347,17 @@ int hdmi_compute_acr(u32 pclk, u32 sample_freq, u32 *n, u32 *cts)
case 96000:
case 192000:
if (deep_color == 125)
- if (pclk == 27027 || pclk == 74250)
+ if (pclk == 27027000 || pclk == 74250000)
deep_color_correct = true;
if (deep_color == 150)
- if (pclk == 27027)
+ if (pclk == 27027000)
deep_color_correct = true;
break;
case 44100:
case 88200:
case 176400:
if (deep_color == 125)
- if (pclk == 27027)
+ if (pclk == 27027000)
deep_color_correct = true;
break;
default:
@@ -418,7 +418,7 @@ int hdmi_compute_acr(u32 pclk, u32 sample_freq, u32 *n, u32 *cts)
}
}
/* Calculate CTS. See HDMI 1.3a or 1.4a specifications */
- *cts = pclk * (*n / 128) * deep_color / (sample_freq / 10);
+ *cts = (pclk/1000) * (*n / 128) * deep_color / (sample_freq / 10);
return 0;
}