summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorJeykumar Sankaran <jsanka@codeaurora.org>2015-04-10 17:25:04 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:40:35 -0700
commit28587990fdf68af8dfd3068ce0d46f09cb8caeea (patch)
tree33e7b77232b9f1cdd5c12e5b02d29eded3eb6925 /drivers/video/fbdev/msm
parent9c7a81c5b7a4eb173f32e5d1d2a66750e2d04d5b (diff)
msm: mdss: Return EBADSLT on pipe failures due to priority
Return EBADSLT error for pipe allocation failures due to priority mismatch. This isolation helps the client to identify and allocate pipes to layers efficiently. Change-Id: I601bd4880ade8313be3b870ca4551b40ebb7d00b Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_overlay.c2
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pipe.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index afcf49908ffe..dc9329ca2086 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -782,7 +782,7 @@ int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd,
if (pipe->priority <= left_blend_pipe->priority) {
pr_err("priority limitation. left:%d right%d\n",
left_blend_pipe->priority, pipe->priority);
- ret = -EPERM;
+ ret = -EBADSLT;
goto exit_fail;
} else {
pr_debug("pipe%d is a right_pipe\n", pipe->num);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
index cefc13dec875..51cbdafe0835 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
@@ -1025,7 +1025,8 @@ static struct mdss_mdp_pipe *mdss_mdp_pipe_init(struct mdss_mdp_mixer *mixer,
if (off >= npipes) {
pr_warn("priority limitation. l_pipe:%d. no low priority %d pipe type available.\n",
left_blend_pipe->num, type);
- return NULL;
+ pipe = ERR_PTR(-EBADSLT);
+ return pipe;
}
}