aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-06-08 09:03:14 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-09-03 09:13:30 -0400
commitf79fa7da6a2953c9964f285dfddc61f92ced0a5a (patch)
tree806c3c76f078c4f0058e307f6d1103f03893a2da
parent7c27fa57ef31debf62c5529725d4fa096b336a99 (diff)
drm/omap: dpi: Don't fixup video mode in dpi_set_mode()
The video mode is aleady fixed up by the .check_timings() operation, there's no need to repeat that when enabling the DPI output. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dpi.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index d814d71fffbc..2a4ad732679f 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -347,10 +347,9 @@ static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req,
347 347
348static int dpi_set_mode(struct dpi_data *dpi) 348static int dpi_set_mode(struct dpi_data *dpi)
349{ 349{
350 struct videomode *vm = &dpi->vm; 350 const struct videomode *vm = &dpi->vm;
351 int lck_div = 0, pck_div = 0; 351 int lck_div = 0, pck_div = 0;
352 unsigned long fck = 0; 352 unsigned long fck = 0;
353 unsigned long pck;
354 int r = 0; 353 int r = 0;
355 354
356 if (dpi->pll) 355 if (dpi->pll)
@@ -362,15 +361,6 @@ static int dpi_set_mode(struct dpi_data *dpi)
362 if (r) 361 if (r)
363 return r; 362 return r;
364 363
365 pck = fck / lck_div / pck_div;
366
367 if (pck != vm->pixelclock) {
368 DSSWARN("Could not find exact pixel clock. Requested %lu Hz, got %lu Hz\n",
369 vm->pixelclock, pck);
370
371 vm->pixelclock = pck;
372 }
373
374 dss_mgr_set_timings(&dpi->output, vm); 364 dss_mgr_set_timings(&dpi->output, vm);
375 365
376 return 0; 366 return 0;