Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8050cbe4 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

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: default avatarArchit Taneja <archit@ti.com>
parent 23c8f88e

drivers/video/omap2/dss/apply.c

+2 −4
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ 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;
@@ -552,9 +552,7 @@ 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

drivers/video/omap2/dss/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -2157,8 +2157,7 @@ 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;
@@ -2174,6 +2173,7 @@ 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);

drivers/video/omap2/dss/dss.h

+1 −2
Original line number Diff line number Diff line
@@ -403,8 +403,7 @@ 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);