From 181fe45da1502dde00ebe5dd1d488ecc74fcebc7 Mon Sep 17 00:00:00 2001 From: Sree Sesha Aravind Vadrevu Date: Sat, 10 Aug 2013 01:08:50 -0700 Subject: msm: mdss: Allow DMA pipe sharing only on WB mixer DMA pipe can only be shared on the writeback mixer for concurrent line and block mode operations. Only allow sharing if the mixer attached to the pipe is already a writeback mixer. Change-Id: I9a0e5144fdf87f681493cd92d9cc809836ab1a5c Signed-off-by: Sree Sesha Aravind Vadrevu --- drivers/video/fbdev/msm/mdss_mdp_pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index 3f75053a46b0..ade9f0d44e81 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -345,6 +345,8 @@ static struct mdss_mdp_pipe *mdss_mdp_pipe_init(struct mdss_mdp_mixer *mixer, * shared as long as its attached to a writeback mixer */ pipe = mdata->dma_pipes + mixer->num; + if (pipe->mixer->type != MDSS_MDP_MIXER_TYPE_WRITEBACK) + return NULL; mdss_mdp_pipe_map(pipe); pr_debug("pipe sharing for pipe=%d\n", pipe->num); } else { -- cgit v1.2.3