From 49d266e4ae68993fbe79ef740a33945ffb624ebd Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 8 Sep 2011 12:51:10 +0530 Subject: [PATCH] --- yaml --- r: 271440 b: refs/heads/master c: ebdc52499f56ddb63318e7bcb5e80b774bb80264 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92925cfc97e6..1401da1b0e0c 100644 --- 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 index 57074b33f024..829be3bbafcc 100644 --- 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);