Skip to content

Commit f6c8723

Browse files
mediatek-jitaockhu-mediatek
authored andcommitted
drm/mediatek: fixed the calc method of data rate per lane
Tune dsi frame rate by pixel clock, dsi add some extra signal (i.e. Tlpx, Ths-prepare, Ths-zero, Ths-trail,Ths-exit) when enter and exit LP mode, those signals will cause h-time larger than normal and reduce FPS. So need to multiply a coefficient to offset the extra signal's effect. coefficient = ((htotal*bpp/lane_number)+Tlpx+Ths_prep+Ths_zero+ Ths_trail+Ths_exit)/(htotal*bpp/lane_number) Signed-off-by: Jitao Shi <[email protected]> Reviewed-by: Daniel Kurtz <[email protected]>
1 parent 1ee6f34 commit f6c8723

File tree

1 file changed

+48
-16
lines changed

1 file changed

+48
-16
lines changed

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
#define DSI_PHY_TIMECON0 0x110
8888
#define LPX (0xff << 0)
89-
#define HS_PRPR (0xff << 8)
89+
#define HS_PREP (0xff << 8)
9090
#define HS_ZERO (0xff << 16)
9191
#define HS_TRAIL (0xff << 24)
9292

@@ -102,10 +102,16 @@
102102
#define CLK_TRAIL (0xff << 24)
103103

104104
#define DSI_PHY_TIMECON3 0x11c
105-
#define CLK_HS_PRPR (0xff << 0)
105+
#define CLK_HS_PREP (0xff << 0)
106106
#define CLK_HS_POST (0xff << 8)
107107
#define CLK_HS_EXIT (0xff << 16)
108108

109+
#define T_LPX 5
110+
#define T_HS_PREP 6
111+
#define T_HS_TRAIL 8
112+
#define T_HS_EXIT 7
113+
#define T_HS_ZERO 10
114+
109115
#define NS_TO_CYCLE(n, c) ((n) / (c) + (((n) % (c)) ? 1 : 0))
110116

111117
struct phy;
@@ -161,20 +167,18 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data)
161167
static void dsi_phy_timconfig(struct mtk_dsi *dsi)
162168
{
163169
u32 timcon0, timcon1, timcon2, timcon3;
164-
unsigned int ui, cycle_time;
165-
unsigned int lpx;
170+
u32 ui, cycle_time;
166171

167172
ui = 1000 / dsi->data_rate + 0x01;
168173
cycle_time = 8000 / dsi->data_rate + 0x01;
169-
lpx = 5;
170174

171-
timcon0 = (8 << 24) | (0xa << 16) | (0x6 << 8) | lpx;
172-
timcon1 = (7 << 24) | (5 * lpx << 16) | ((3 * lpx) / 2) << 8 |
173-
(4 * lpx);
175+
timcon0 = T_LPX | T_HS_PREP << 8 | T_HS_ZERO << 16 | T_HS_TRAIL << 24;
176+
timcon1 = 4 * T_LPX | (3 * T_LPX / 2) << 8 | 5 * T_LPX << 16 |
177+
T_HS_EXIT << 24;
174178
timcon2 = ((NS_TO_CYCLE(0x64, cycle_time) + 0xa) << 24) |
175179
(NS_TO_CYCLE(0x150, cycle_time) << 16);
176-
timcon3 = (2 * lpx) << 16 | NS_TO_CYCLE(80 + 52 * ui, cycle_time) << 8 |
177-
NS_TO_CYCLE(0x40, cycle_time);
180+
timcon3 = NS_TO_CYCLE(0x40, cycle_time) | (2 * T_LPX) << 16 |
181+
NS_TO_CYCLE(80 + 52 * ui, cycle_time) << 8;
178182

179183
writel(timcon0, dsi->regs + DSI_PHY_TIMECON0);
180184
writel(timcon1, dsi->regs + DSI_PHY_TIMECON1);
@@ -202,19 +206,47 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi)
202206
{
203207
struct device *dev = dsi->dev;
204208
int ret;
209+
u64 pixel_clock, total_bits;
210+
u32 htotal, htotal_bits, bit_per_pixel, overhead_cycles, overhead_bits;
205211

206212
if (++dsi->refcount != 1)
207213
return 0;
208214

215+
switch (dsi->format) {
216+
case MIPI_DSI_FMT_RGB565:
217+
bit_per_pixel = 16;
218+
break;
219+
case MIPI_DSI_FMT_RGB666_PACKED:
220+
bit_per_pixel = 18;
221+
break;
222+
case MIPI_DSI_FMT_RGB666:
223+
case MIPI_DSI_FMT_RGB888:
224+
default:
225+
bit_per_pixel = 24;
226+
break;
227+
}
228+
209229
/**
210-
* data_rate = (pixel_clock / 1000) * pixel_dipth * mipi_ratio;
211-
* pixel_clock unit is Khz, data_rata unit is MHz, so need divide 1000.
212-
* mipi_ratio is mipi clk coefficient for balance the pixel clk in mipi.
213-
* we set mipi_ratio is 1.05.
230+
* vm.pixelclock is in kHz, pixel_clock unit is Hz, so multiply by 1000
231+
* htotal_time = htotal * byte_per_pixel / num_lanes
232+
* overhead_time = lpx + hs_prepare + hs_zero + hs_trail + hs_exit
233+
* mipi_ratio = (htotal_time + overhead_time) / htotal_time
234+
* data_rate = pixel_clock * bit_per_pixel * mipi_ratio / num_lanes;
214235
*/
215-
dsi->data_rate = dsi->vm.pixelclock * 3 * 21 / (1 * 1000 * 10);
236+
pixel_clock = dsi->vm.pixelclock * 1000;
237+
htotal = dsi->vm.hactive + dsi->vm.hback_porch + dsi->vm.hfront_porch +
238+
dsi->vm.hsync_len;
239+
htotal_bits = htotal * bit_per_pixel;
240+
241+
overhead_cycles = T_LPX + T_HS_PREP + T_HS_ZERO + T_HS_TRAIL +
242+
T_HS_EXIT;
243+
overhead_bits = overhead_cycles * dsi->lanes * 8;
244+
total_bits = htotal_bits + overhead_bits;
245+
246+
dsi->data_rate = DIV_ROUND_UP_ULL(pixel_clock * total_bits,
247+
htotal * dsi->lanes);
216248

217-
ret = clk_set_rate(dsi->hs_clk, dsi->data_rate * 1000000);
249+
ret = clk_set_rate(dsi->hs_clk, dsi->data_rate);
218250
if (ret < 0) {
219251
dev_err(dev, "Failed to set data rate: %d\n", ret);
220252
goto err_refcount;

0 commit comments

Comments
 (0)