From b18b3e155bb89993bec55698c0aefc5f05fd0ec1 Mon Sep 17 00:00:00 2001 From: Adrian Salido-Moreno Date: Mon, 14 Jan 2013 19:26:29 -0800 Subject: msm: mdss: remove mixer stage check in overlay To support cases in which there might be changes in mixer stage before commit, allow user space to set any mixer stage even though it's being used by a different pipe, the replaced pipe can then be used in a different mixer stage or cleaned up. Change-Id: Id12ed4e9c4d08e0ed4b559be38beb2a44cd85c80 Signed-off-by: Adrian Salido-Moreno --- drivers/video/fbdev/msm/mdss_mdp_overlay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c index 338cf8704341..3956228c8d0a 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c +++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c @@ -263,11 +263,11 @@ static int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, pipe = mdss_mdp_mixer_stage_pipe(mfd->ctl, mixer_mux, req->z_order); if (pipe && pipe->ndx != req->id) { - pr_err("stage %d taken by pnum=%d\n", req->z_order, pipe->num); - return -EBUSY; + pr_debug("replacing pnum=%d at stage=%d mux=%d\n", + pipe->num, req->z_order, mixer_mux); + pipe->params_changed = true; } - if (req->id == MSMFB_NEW_REQUEST) { mixer = mdss_mdp_mixer_get(mfd->ctl, mixer_mux); if (!mixer) { -- cgit v1.2.3