OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7df5ad
)
OMAPDSS: handle WB channel in dispc_set/get_channel_out
author
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Wed, 4 Nov 2015 15:10:47 +0000
(17:10 +0200)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Tue, 29 Dec 2015 09:06:26 +0000
(11:06 +0200)
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>
drivers/video/fbdev/omap2/dss/dispc.c
patch
|
blob
|
history
diff --git
a/drivers/video/fbdev/omap2/dss/dispc.c
b/drivers/video/fbdev/omap2/dss/dispc.c
index
678a192
..
4126d62
100644
(file)
--- 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;
}
}