summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-08-15 09:56:39 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-09-03 14:14:34 -0700
commit39640f9ad2012d417263586a33dba8e3d8823457 (patch)
treec68735765ef88d43c1a3cd2ca9ce1dac876eb46d /drivers
parentc4eb189e1cae98c5535c0a26e859a010b0c70510 (diff)
ipu_disp: disable alpha mode when color-keying
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mxc/ipu3/ipu_disp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c
index 61383a380db9..82386d0c2c47 100644
--- a/drivers/mxc/ipu3/ipu_disp.c
+++ b/drivers/mxc/ipu3/ipu_disp.c
@@ -2773,6 +2773,7 @@ int32_t ipu_disp_set_color_key(struct ipu_soc *ipu, ipu_channel_t channel,
ipu_dp_write(ipu, reg | color_key, DP_GRAPH_WIND_CTRL(flow));
reg = ipu_dp_read(ipu, DP_COM_CONF(flow));
+ reg &= ~DP_COM_CONF_GWAM;
ipu_dp_write(ipu, reg | DP_COM_CONF_GWCKE, DP_COM_CONF(flow));
} else {
reg = ipu_dp_read(ipu, DP_COM_CONF(flow));