From 2666676c1db8b6c50cd97e668c773e5b072de188 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 7 May 2009 14:32:55 +0300 Subject: [PATCH 064/146] DSS2: DSI: tune the timings to be more relaxed Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dsi.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 5225ed6..67ecfcf 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -1396,28 +1396,28 @@ static void dsi_complexio_timings(void) /* 1 * DDR_CLK = 2 * UI */ /* min 40ns + 4*UI max 85ns + 6*UI */ - ths_prepare = ns2ddr(59) + 2; + ths_prepare = ns2ddr(70) + 2; /* min 145ns + 10*UI */ - ths_prepare_ths_zero = ns2ddr(145) + 5; + ths_prepare_ths_zero = ns2ddr(175) + 2; /* min max(8*UI, 60ns+4*UI) */ - ths_trail = max((unsigned)4, ns2ddr(60) + 2); + ths_trail = ns2ddr(60) + 5; /* min 100ns */ - ths_exit = ns2ddr(100); + ths_exit = ns2ddr(145); /* tlpx min 50n */ tlpx_half = ns2ddr(25); /* min 60ns */ - tclk_trail = ns2ddr(60); + tclk_trail = ns2ddr(60) + 2; /* min 38ns, max 95ns */ - tclk_prepare = ns2ddr(38); + tclk_prepare = ns2ddr(65); /* min tclk-prepare + tclk-zero = 300ns */ - tclk_zero = ns2ddr(300 - 38); + tclk_zero = ns2ddr(260); DSSDBG("ths_prepare %u (%uns), ths_prepare_ths_zero %u (%uns)\n", ths_prepare, ddr2ns(ths_prepare), @@ -2340,9 +2340,19 @@ static void dsi_proto_timings(struct omap_display *display) /* min 60ns + 52*UI */ tclk_post = ns2ddr(60) + 26; + /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ + if (display->hw_config.u.dsi.data1_lane != 0 && + display->hw_config.u.dsi.data2_lane != 0) + ths_eot = 2; + else + ths_eot = 4; + ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare, 4); - ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4); + ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4) + ths_eot; + + BUG_ON(ddr_clk_pre == 0 || ddr_clk_pre > 255); + BUG_ON(ddr_clk_post == 0 || ddr_clk_post > 255); r = dsi_read_reg(DSI_CLK_TIMING); r = FLD_MOD(r, ddr_clk_pre, 15, 8); @@ -2353,14 +2363,9 @@ static void dsi_proto_timings(struct omap_display *display) ddr_clk_pre, ddr_clk_post); - /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ - if (display->hw_config.u.dsi.data1_lane != 0 && - display->hw_config.u.dsi.data2_lane != 0) - ths_eot = 2; - else - ths_eot = 4; - - enter_hs_mode_lat = DIV_ROUND_UP(tlpx + ths_prepare + ths_zero, 4) + 4; + enter_hs_mode_lat = 1 + DIV_ROUND_UP(tlpx, 4) + + DIV_ROUND_UP(ths_prepare, 4) + + DIV_ROUND_UP(ths_zero + 3, 4); exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot; r = FLD_VAL(enter_hs_mode_lat, 31, 16) | -- 1.6.2.4