aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/apply.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-05-08 06:23:20 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-09 06:44:09 -0400
commit81ab95b7ec91e47c81e5e6ef4aac7b08c1ae90aa (patch)
treef20c901613fa622b2e05d0d20c0aa001925d5dd2 /drivers/video/omap2/dss/apply.c
parent3fa03ba8542c40b90c95facfecd9b2789f71c0b6 (diff)
OMAPDSS: DISPC: Remove usage of dispc_mgr_get_device()
The functions calc_fclk_five_taps() and check_horiz_timing_omap3() use the function dispc_mgr_get_device() to get the omap_dss_device pointer to which the manager is connected, the width of the panel is derived from that. The manager's timing is stored in it's private data in APPLY. This contains the latest timings applied to the manager. Pass these timings to dispc_ovl_setup() and use them in the above functions. Remove the function dispc_mgr_get_device() as it isn't used any more. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
-rw-r--r--drivers/video/omap2/dss/apply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 15c070cc695f..dd88b8f936c4 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -548,11 +548,13 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
548 548
549 oi = &op->info; 549 oi = &op->info;
550 550
551 mp = get_mgr_priv(ovl->manager);
552
551 replication = dss_use_replication(ovl->manager->device, oi->color_mode); 553 replication = dss_use_replication(ovl->manager->device, oi->color_mode);
552 554
553 ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC; 555 ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC;
554 556
555 r = dispc_ovl_setup(ovl->id, oi, ilace, replication); 557 r = dispc_ovl_setup(ovl->id, oi, ilace, replication, &mp->timings);
556 if (r) { 558 if (r) {
557 /* 559 /*
558 * We can't do much here, as this function can be called from 560 * We can't do much here, as this function can be called from
@@ -566,8 +568,6 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
566 return; 568 return;
567 } 569 }
568 570
569 mp = get_mgr_priv(ovl->manager);
570
571 op->info_dirty = false; 571 op->info_dirty = false;
572 if (mp->updating) 572 if (mp->updating)
573 op->shadow_info_dirty = true; 573 op->shadow_info_dirty = true;