diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-01-13 13:24:04 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-01-25 13:46:17 +0200 |
| commit | e6b0f884520e604408ebda3b60605cabe0a8d162 (patch) | |
| tree | 3c0dc6ce2fc728c446c009d8fa6b39e1549367c3 /drivers/video/omap2/dss/dss_features.h | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| download | op-kernel-dev-e6b0f884520e604408ebda3b60605cabe0a8d162.zip op-kernel-dev-e6b0f884520e604408ebda3b60605cabe0a8d162.tar.gz | |
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>
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.h')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index cd833bb..50caee9 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h @@ -58,6 +58,7 @@ enum dss_feat_id { FEAT_FIR_COEF_V = 1 << 25, FEAT_ALPHA_FIXED_ZORDER = 1 << 26, FEAT_ALPHA_FREE_ZORDER = 1 << 27, + FEAT_FIFO_MERGE = 1 << 28, }; /* DSS register field id */ |
