diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-04 16:10:47 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 10:06:26 +0100 |
| commit | c2665c4150ece59f13dcc78b9012d297acd96358 (patch) | |
| tree | 96139e6fbe0fd60e7526f1b10c83d2ccc0defcf1 /drivers/video | |
| parent | OMAPDSS: refactor dispc_ovl_get_channel_out (diff) | |
| download | linux-c2665c4150ece59f13dcc78b9012d297acd96358.tar.xz linux-c2665c4150ece59f13dcc78b9012d297acd96358.zip | |
OMAPDSS: handle WB channel in dispc_set/get_channel_out
Add handling of OMAP_DSS_CHANNEL_WB to dispc_ovl_set_channel_out() and
dispc_ovl_get_channel_out().
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index 678a1928a9b5..4126d6225faf 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c @@ -974,6 +974,10 @@ void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel) return; } break; + case OMAP_DSS_CHANNEL_WB: + chan = 0; + chan2 = 3; + break; default: BUG(); return; @@ -1023,6 +1027,8 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane) return OMAP_DSS_CHANNEL_LCD2; case 2: return OMAP_DSS_CHANNEL_LCD3; + case 3: + return OMAP_DSS_CHANNEL_WB; } } |