diff options
author | Archit Taneja <archit@ti.com> | 2012-04-26 15:52:28 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 06:44:07 -0400 |
commit | 228b21349db4ca5636ec1efdb3b3d54fe18092de (patch) | |
tree | 61e933b8f50ec5225e91fe2bf6bbfbb11a26c1af /drivers/video/omap2/dss/manager.c | |
parent | 5dd747e8892a63a5d4cc1d2765c0f533a5d74cfd (diff) |
OMAPDSS: APPLY: Remove display dependency from overlay and manager checks
In order to check the validity of overlay and manager info, there was a need to
use the omap_dss_device struct to get the panel resolution. The manager's
private data in APPLY now contains the manager timings. Hence, we don't need to
rely on the display resolution any more.
Pass the manager's timings in private data to dss_mgr_check(). Remove the need
to pass omap_dss_device structs in the functions which check for the validity
of overlay and manager parameters.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager.c')
-rw-r--r-- | drivers/video/omap2/dss/manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index 566fbba16774..0cbcde4c688a 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c | |||
@@ -666,8 +666,8 @@ int dss_mgr_check_timings(struct omap_overlay_manager *mgr, | |||
666 | } | 666 | } |
667 | 667 | ||
668 | int dss_mgr_check(struct omap_overlay_manager *mgr, | 668 | int dss_mgr_check(struct omap_overlay_manager *mgr, |
669 | struct omap_dss_device *dssdev, | ||
670 | struct omap_overlay_manager_info *info, | 669 | struct omap_overlay_manager_info *info, |
670 | const struct omap_video_timings *mgr_timings, | ||
671 | struct omap_overlay_info **overlay_infos) | 671 | struct omap_overlay_info **overlay_infos) |
672 | { | 672 | { |
673 | struct omap_overlay *ovl; | 673 | struct omap_overlay *ovl; |
@@ -679,7 +679,7 @@ int dss_mgr_check(struct omap_overlay_manager *mgr, | |||
679 | return r; | 679 | return r; |
680 | } | 680 | } |
681 | 681 | ||
682 | r = dss_mgr_check_timings(mgr, &dssdev->panel.timings); | 682 | r = dss_mgr_check_timings(mgr, mgr_timings); |
683 | if (r) | 683 | if (r) |
684 | return r; | 684 | return r; |
685 | 685 | ||
@@ -692,7 +692,7 @@ int dss_mgr_check(struct omap_overlay_manager *mgr, | |||
692 | if (oi == NULL) | 692 | if (oi == NULL) |
693 | continue; | 693 | continue; |
694 | 694 | ||
695 | r = dss_ovl_check(ovl, oi, dssdev); | 695 | r = dss_ovl_check(ovl, oi, mgr_timings); |
696 | if (r) | 696 | if (r) |
697 | return r; | 697 | return r; |
698 | } | 698 | } |