---

yaml --- r: 271440 b: refs/heads/master c: ebdc524 h: refs/heads/master v: v3
git-mirror · Sep 30, 2011 · 49d266e · 49d266e
1 parent c689bd3
commit 49d266e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3dc6a7afb47735b82a4c0061e814454a649dbfc
+refs/heads/master: ebdc52499f56ddb63318e7bcb5e80b774bb80264
diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c
@@ -1630,8 +1630,8 @@ static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
 	u64 tmp, pclk = dispc_mgr_pclk_rate(channel);
 
 	if (height > out_height) {
-		/* FIXME get real display PPL */
-		unsigned int ppl = 800;
+		struct omap_dss_device *dssdev = dispc_mgr_get_device(channel);
+		unsigned int ppl = dssdev->panel.timings.x_res;
 
 		tmp = pclk * height * out_width;
 		do_div(tmp, 2 * out_height * ppl);