summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2011-09-08 12:51:10 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 16:17:26 +0300
commitebdc52499f56ddb63318e7bcb5e80b774bb80264 (patch)
treeb292f305562acdb219f0346636325c008bf963ee /drivers/video
parentc3dc6a7afb47735b82a4c0061e814454a649dbfc (diff)
downloadlinux-ebdc52499f56ddb63318e7bcb5e80b774bb80264.tar.bz2
OMAPDSS: DISPC: Remove hardcoded use of PPL in five tap clock calculation
The function calc_fclk_five_taps() uses a fixed value of pixels per line which is used in calculations to get the minimum fclk needed for scaling with five taps to work. Remove this by providing the width of the panel connected to the manager. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dispc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 57074b33f024..829be3bbafcc 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/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);