From 54b86bf24f40c8c9b4246317495ab2aa2d77c5ed Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 15 May 2012 15:31:01 +0300 Subject: [PATCH] --- yaml --- r: 310367 b: refs/heads/master c: 3568f2a46f2a73bab18c914df06afd98a97e0e0e h: refs/heads/master i: 310365: 0ee692b2cd29e12d1e735973138514759f027544 310363: b79bdf73343ff69b430d0fd3bb4133c31b3f9405 310359: 1075e74a8e2e65afa89c305bcec1673b66d8f01f 310351: 11a05e3eb0a4654e4625e559eec8f8d387255d4c 310335: 0f46409db8e556c82d392be89ceced7f9b591ee7 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 5 +++-- trunk/drivers/video/omap2/dss/dss.h | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1b0e3079b8c2..57be2ccfea51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f28c2964b535f9439d52c437aa2fbfef7ed149c +refs/heads/master: 3568f2a46f2a73bab18c914df06afd98a97e0e0e diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index dd88b8f936c4..ab22cc224f3e 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -966,7 +966,7 @@ static void dss_ovl_setup_fifo(struct omap_overlay *ovl, return; dispc_ovl_compute_fifo_thresholds(ovl->id, &fifo_low, &fifo_high, - use_fifo_merge); + use_fifo_merge, ovl_manual_update(ovl)); dss_apply_ovl_fifo_thresholds(ovl, fifo_low, fifo_high); } diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index b81fafac35b8..ac71fec1dbba 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -1031,7 +1031,8 @@ void dispc_enable_fifomerge(bool enable) } void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane, - u32 *fifo_low, u32 *fifo_high, bool use_fifomerge) + u32 *fifo_low, u32 *fifo_high, bool use_fifomerge, + bool manual_update) { /* * All sizes are in bytes. Both the buffer and burst are made of @@ -1059,7 +1060,7 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane, * combined fifo size */ - if (dss_has_feature(FEAT_OMAP3_DSI_FIFO_BUG)) { + if (manual_update && dss_has_feature(FEAT_OMAP3_DSI_FIFO_BUG)) { *fifo_low = ovl_fifo_size - burst_size * 2; *fifo_high = total_fifo_size - burst_size; } else { diff --git a/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h index 4aa9529a4768..dd1092ceaeef 100644 --- a/trunk/drivers/video/omap2/dss/dss.h +++ b/trunk/drivers/video/omap2/dss/dss.h @@ -395,7 +395,8 @@ int dispc_calc_clock_rates(unsigned long dispc_fclk_rate, void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high); void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane, - u32 *fifo_low, u32 *fifo_high, bool use_fifomerge); + u32 *fifo_low, u32 *fifo_high, bool use_fifomerge, + bool manual_update); int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi, bool ilace, bool replication, const struct omap_video_timings *mgr_timings);