mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
OMAPDSS: refactor dispc_ovl_get_channel_out
Refactor dispc_ovl_get_channel_out() to a bit cleaner form, which makes it easier to add support for writeback in the following patch. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
249ad8a38e
commit
d7df5ad44b
1 changed files with 14 additions and 17 deletions
|
@ -992,7 +992,6 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane)
|
|||
{
|
||||
int shift;
|
||||
u32 val;
|
||||
enum omap_channel channel;
|
||||
|
||||
switch (plane) {
|
||||
case OMAP_DSS_GFX:
|
||||
|
@ -1010,23 +1009,21 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane)
|
|||
|
||||
val = dispc_read_reg(DISPC_OVL_ATTRIBUTES(plane));
|
||||
|
||||
if (dss_has_feature(FEAT_MGR_LCD3)) {
|
||||
if (FLD_GET(val, 31, 30) == 0)
|
||||
channel = FLD_GET(val, shift, shift);
|
||||
else if (FLD_GET(val, 31, 30) == 1)
|
||||
channel = OMAP_DSS_CHANNEL_LCD2;
|
||||
else
|
||||
channel = OMAP_DSS_CHANNEL_LCD3;
|
||||
} else if (dss_has_feature(FEAT_MGR_LCD2)) {
|
||||
if (FLD_GET(val, 31, 30) == 0)
|
||||
channel = FLD_GET(val, shift, shift);
|
||||
else
|
||||
channel = OMAP_DSS_CHANNEL_LCD2;
|
||||
} else {
|
||||
channel = FLD_GET(val, shift, shift);
|
||||
}
|
||||
if (FLD_GET(val, shift, shift) == 1)
|
||||
return OMAP_DSS_CHANNEL_DIGIT;
|
||||
|
||||
return channel;
|
||||
if (!dss_has_feature(FEAT_MGR_LCD2))
|
||||
return OMAP_DSS_CHANNEL_LCD;
|
||||
|
||||
switch (FLD_GET(val, 31, 30)) {
|
||||
case 0:
|
||||
default:
|
||||
return OMAP_DSS_CHANNEL_LCD;
|
||||
case 1:
|
||||
return OMAP_DSS_CHANNEL_LCD2;
|
||||
case 2:
|
||||
return OMAP_DSS_CHANNEL_LCD3;
|
||||
}
|
||||
}
|
||||
|
||||
void dispc_wb_set_channel_in(enum dss_writeback_channel channel)
|
||||
|
|
Loading…
Reference in a new issue