Commit 69036f0c authored Sep 26, 2012 by Tomi Valkeinen

Merge branch 'archit/wb-dispc-for-3.7'

Merge omapdss writeback work. These patches implement the low level writeback
features in the DISPC, but do not yet add a way to actually use the writeback
from the userspace.

* archit/wb-dispc-for-3.7:
OMAPDSS: DISPC: Configure color conversion coefficients for writeback
OMAPDSS: DISPC: Add manager like functions for writeback
OMAPDSS: DISPC: Configure writeback FIFOs
OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
OMAPDSS: DISPC: Add function to set channel in for writeback
OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
OMAPDSS: DISPC: Downscale chroma if plane is writeback
OMAPDSS: DISPC: Configure input and output sizes for writeback
OMAPDSS: DISPC: Add writeback register offsets and dss features structs
OMAPDSS: DISPC: Allow both upscaling and downscaling of chroma
OMAPDSS: DIPSC: Relax scaling limitations when in memory to memory mode
OMAPDSS: DISPC: Don't pass channel out when configuring overlays
OMAPDSS: DISPC: Make dispc_ovl_setup call dispc_ovl_setup_common
OMAPDSS: OVERLAY: Add position and replication as overlay caps
OMAPDSS: DISPC: Pass overlay caps as a parameter to dispc plane functions
OMAPDSS: DISPC: Simplify function names for setting pipeline input and output sizes
OMAPDSS: DISPC: Constify omap_overlay_info in dispc_ovl_setup()

parents 866f0956 6e5264b0

drivers/video/omap2/dss/apply.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)

		replication = dss_ovl_use_replication(mp->lcd_config, oi->color_mode);

		r = dispc_ovl_setup(ovl->id, oi, replication, &mp->timings);
		r = dispc_ovl_setup(ovl->id, oi, replication, &mp->timings, false);
		if (r) {
		/*
		* We can't do much here, as this function can be called from