OMAPDSS: FEAT: Add FIFO_MERGE feature
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 13 Jan 2012 11:24:04 +0000 (13:24 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 25 Jan 2012 11:46:17 +0000 (13:46 +0200)
commite6b0f884520e604408ebda3b60605cabe0a8d162
tree3c0dc6ce2fc728c446c009d8fa6b39e1549367c3
parentdcd6c92267155e70a94b3927bce681ce74b80d1f
OMAPDSS: FEAT: Add FIFO_MERGE feature

Add feature flag for fifo merge. OMAP2 doesn't contain fifo merge, later
OMAPs do.

dispc_enable_fifomerge() checks for the flag when called, and gives a
WARN if fifo merge is being enabled when it is not supported.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h