OMAPDSS: DISPC/APPLY: Use interlace info in manager timings for dispc_ovl_setup()

Gitweb:     http://git.kernel.org/linus/;a=commit;h=8050cbe4cd9a96ff333df718f38830eabab690bd
Commit:     8050cbe4cd9a96ff333df718f38830eabab690bd
Parent:     23c8f88e8a140c8435658c369b26c7b60d8fe3c0
Author:     Archit Taneja <archit <at> ti.com>
AuthorDate: Wed Jun 6 16:25:52 2012 +0530
Committer:  Tomi Valkeinen <tomi.valkeinen <at> ti.com>
CommitDate: Fri Jun 29 10:15:52 2012 +0300

    OMAPDSS: DISPC/APPLY: Use interlace info in manager timings for dispc_ovl_setup()

    Currently the interlace parameter passed to dispc_ovl_setup() is configured by
    checking the display type, and set to true if the display type is VENC.

    This isn't correct as other panels can take interlaced content too. The
    omap_video_timings struct in manager's private data contains the info whether
    the panel is in interlaced mode or not.

    Signed-off-by: Archit Taneja <archit <at> ti.com>
---
 drivers/video/omap2/dss/apply.c |    6 ++----
 drivers/video/omap2/dss/dispc.c |    4 ++--
 drivers/video/omap2/dss/dss.h   |    3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index ab22cc2..3ce7a3e 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
 <at>  <at>  -537,7 +537,7  <at>  <at>  static void dss_ovl_write_regs(struct omap_overlay *ovl)
 {
 	struct ovl_priv_data *op = get_ovl_priv(ovl);
 	struct omap_overlay_info *oi;
-	bool ilace, replication;
+	bool replication;
 	struct mgr_priv_data *mp;
 	int r;

 <at>  <at>  -552,9 +552,7  <at>  <at>  static void dss_ovl_write_regs(struct omap_overlay *ovl)

 	replication = dss_use_replication(ovl->manager->device, oi->color_mode);

-	ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC;
-
-	r = dispc_ovl_setup(ovl->id, oi, ilace, replication, &mp->timings);
+	r = dispc_ovl_setup(ovl->id, oi, replication, &mp->timings);
 	if (r) {
 		/*
 		 * We can't do much here, as this function can be called from
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index d200f44..d1a7a0c 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
 <at>  <at>  -2157,8 +2157,7  <at>  <at>  static int dispc_ovl_calc_scaling(enum omap_plane plane,
 }

 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-		bool ilace, bool replication,
-		const struct omap_video_timings *mgr_timings)
+		bool replication, const struct omap_video_timings *mgr_timings)
 {
 	struct omap_overlay *ovl = omap_dss_get_overlay(plane);
 	bool five_taps = true;
 <at>  <at>  -2174,6 +2173,7  <at>  <at>  int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
 	u16 out_width, out_height;
 	enum omap_channel channel;
 	int x_predecim = 1, y_predecim = 1;
+	bool ilace = mgr_timings->interlace;

 	channel = dispc_ovl_get_channel_out(plane);

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index dc0c0a6..6c5ecf0 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
 <at>  <at>  -403,8 +403,7  <at>  <at>  void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
 		u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,
 		bool manual_update);
 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-		bool ilace, bool replication,
-		const struct omap_video_timings *mgr_timings);
+		bool replication, const struct omap_video_timings *mgr_timings);
 int dispc_ovl_enable(enum omap_plane plane, bool enable);
 void dispc_ovl_set_channel_out(enum omap_plane plane,
 		enum omap_channel channel);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html