summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-11-04 17:10:47 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-29 11:06:26 +0200
commitc2665c4150ece59f13dcc78b9012d297acd96358 (patch)
tree96139e6fbe0fd60e7526f1b10c83d2ccc0defcf1 /drivers/video
parentd7df5ad44b1427598d7296b2c889988a63a4bce2 (diff)
downloadop-kernel-dev-c2665c4150ece59f13dcc78b9012d297acd96358.zip
op-kernel-dev-c2665c4150ece59f13dcc78b9012d297acd96358.tar.gz
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.c6
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 678a192..4126d62 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;
}
}
OpenPOWER on IntegriCloud