diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-16 17:13:59 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-16 17:13:59 +0100 |
commit | aef3564ff85a9ddf49eb7a1349dec04ec243970d (patch) | |
tree | 618e6e8483cf20d719617c763df5bda124114458 /drivers/video/tegra/dc/mode.c | |
parent | 5a2c06a6918ae041a81c7f6caaf627b717324f2c (diff) |
android: dc: tegra: video: conditionally revert timestamp support
Android R14 userspace seems to have issues with timestamp support:
[ 14.764337] host1x host1x: SurfaceFlinger: syncpoint id 8 (disp0_a) stuck waiting 3, timeout=2147483447
[ 14.773845] host1x host1x: id 8 (disp0_a) min 2 max 4
[ 14.779163] host1x host1x: id 9 (disp1_a) min 2 max 4
[ 14.784316] host1x host1x: id 18 (2d_0) min 21 max 25
[ 14.789586] host1x host1x: id 20 (disp0_b) min 2 max 4
[ 14.794889] host1x host1x: id 21 (disp1_b) min 2 max 4
[ 14.800241] host1x host1x: id 22 (3d) min 77 max 95
[ 14.805217] host1x host1x: id 24 (disp0_c) min 2 max 4
[ 14.810573] host1x host1x: id 25 (disp1_c) min 2 max 4
[ 14.815873] host1x host1x: id 26 (vblank0) min 800 max 0
[ 14.821264] host1x host1x: id 27 (vblank1) min 684 max 0
[ 14.826810] host1x host1x: waitbase id 3 val 77
Therefore conditionally revert it in that case for now.
See e4e2e776a3d4bf1adf37fc061cfdfb92281f3ace.
Diffstat (limited to 'drivers/video/tegra/dc/mode.c')
-rw-r--r-- | drivers/video/tegra/dc/mode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c index 3a95f2e7ab0e..6457f9604e90 100644 --- a/drivers/video/tegra/dc/mode.c +++ b/drivers/video/tegra/dc/mode.c @@ -137,6 +137,7 @@ static bool check_ref_to_sync(struct tegra_dc_mode *mode) return true; } +#ifndef CONFIG_ANDROID static s64 calc_frametime_ns(const struct tegra_dc_mode *m) { long h_total, v_total; @@ -147,6 +148,7 @@ static s64 calc_frametime_ns(const struct tegra_dc_mode *m) return (!m->pclk) ? 0 : (s64)(div_s64(((s64)h_total * v_total * 1000000000ULL), m->pclk)); } +#endif /* !CONFIG_ANDROID */ /* return in 1000ths of a Hertz */ int tegra_dc_calc_refresh(const struct tegra_dc_mode *m) @@ -276,7 +278,9 @@ int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode) panel_sync_rate = dc->out->dsi->rated_refresh_rate * 1000; print_mode(dc, mode, __func__); +#ifndef CONFIG_ANDROID dc->frametime_ns = calc_frametime_ns(mode); +#endif /* !CONFIG_ANDROID */ return 0; } |