summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-01-17 03:58:39 +0400
committerAlejandro Mery <amery@geeks.cl>2013-01-24 20:28:55 +0400
commit9674eb10ca6c303646dcb5eb8974f2cbecc16dae (patch)
tree1847647c395127cf0e903aa6a6197165f6e62ecb
parentd0488684a800827ae73f90af6f23d1c6939b4597 (diff)
downloadlinux-sunxi-9674eb10ca6c303646dcb5eb8974f2cbecc16dae.tar.xz
sunxi-disp: Fix tv-out / standard tv-modes not working
For the tv / hdmi output lcd_clk_div is not used when programming the pll, instead pre_scale is used. My commit titled: "sunxi-hdmi: Dynamically determine pll frequency for hdmi modes" Wrongly sets lcd_clk_div rather then setting pre_scale. This bug did not get noticed sofar because pre_scale gets initialized to 1, which is the correct value for non 27000000 Hz pixelclock modes. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--drivers/video/sunxi/disp/disp_clk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/sunxi/disp/disp_clk.c b/drivers/video/sunxi/disp/disp_clk.c
index e8abb69ec28c..238f1e477936 100644
--- a/drivers/video/sunxi/disp/disp_clk.c
+++ b/drivers/video/sunxi/disp/disp_clk.c
@@ -963,17 +963,17 @@ __s32 disp_clk_cfg(__u32 sel, __u32 type, __u8 mode)
tve_freq = 27000000;
else
tve_freq = 54000000;
- lcd_clk_div = 2;
+ pre_scale = 2;
} else {
tve_freq = hdmi_freq;
- lcd_clk_div = 1;
+ pre_scale = 1;
}
if (disp_get_pll_freq(hdmi_freq, &pll_freq, &pll_2x) != 0)
return -1;
- pr_info("disp clks: lcd %d lcd_div %d hdmi %d pll %d 2x %d\n",
- tve_freq, lcd_clk_div, hdmi_freq, pll_freq, pll_2x);
+ pr_info("disp clks: lcd %d pre_scale %d hdmi %d pll %d 2x %d\n",
+ tve_freq, pre_scale, hdmi_freq, pll_freq, pll_2x);
} else if (type == DISP_OUTPUT_TYPE_VGA) {
pll_freq = clk_tab.vga_clk_tab[mode].pll_clk;
tve_freq = clk_tab.vga_clk_tab[mode].tve_clk;