summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungjin Kim <nkim@nvidia.com>2012-05-04 20:59:15 +0900
committerSimone Willett <swillett@nvidia.com>2012-05-17 13:45:51 -0700
commit9ff7c60450e8e0196097f0e259b6c45357502934 (patch)
treedf637fbc445b82a9ce6cc6a5c8a7c9c474a3195b
parent99764a49624bdf18cfd4618a8c8c195d620a7992 (diff)
video: tegra: hdmi: set correct VIC for 1080p/30Hz mode
Set correct VIC value for 1080p/30Hz mode in AVI infoframe. Bug 969243 Change-Id: I6da9236124dbad7e4d74f3cf6dad7e273bd7778b Signed-off-by: Youngjin Kim <nkim@nvidia.com> Reviewed-on: http://git-master/r/100553 (cherry picked from commit 41858f2fd99face9dc0c47bd2870045291a6c0b6) Reviewed-on: http://git-master/r/102378 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Jon Mayo <jmayo@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/hdmi.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index cd745c0a878b..82af8a15276e 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -2066,9 +2066,12 @@ static void tegra_dc_hdmi_setup_avi_infoframe(struct tegra_dc *dc, bool dvi)
(dc->mode.v_active == 2205 && dc->mode.stereo_mode)) {
/* VIC for both 1080p and 1080p 3D mode */
avi.m = HDMI_AVI_M_16_9;
- if (dc->mode.h_front_porch == 88)
- avi.vic = 16; /* 60 Hz */
- else if (dc->mode.h_front_porch == 528)
+ if (dc->mode.h_front_porch == 88) {
+ if (dc->mode.pclk > 74250000)
+ avi.vic = 16; /* 60 Hz */
+ else
+ avi.vic = 34; /* 30 Hz */
+ } else if (dc->mode.h_front_porch == 528)
avi.vic = 31; /* 50 Hz */
else
avi.vic = 32; /* 24 Hz */