Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-01 02:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge "msm: mdss: add handoff support for multiple pipes on same mixer stage"

Browse source
This commit is contained in:
Linux Build Service Account 2015-01-10 03:39:24 -08:00 committed by Gerrit - the friendly Code Review server
commit de3f351e31
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/video/msm/mdss/mdss_mdp_ctl.c
View file

@ -3693,22 +3693,38 @@ static int __mdss_mdp_mixer_handoff_helper(struct mdss_mdp_mixer *mixer,
struct mdss_mdp_pipe *pipe)
{
int rc = 0;
struct mdss_data_type *mdata = mdss_mdp_get_mdata();
u32 right_blend = 0;
if (!mixer) {
rc = -EINVAL;
goto error;
}
/*
* It is possible to have more the one pipe staged on a single
* layer mixer at same staging level.
*/
if (mixer->stage_pipe[MDSS_MDP_STAGE_UNUSED] != NULL) {
pr_err("More than one pipe staged on mixer num %d\n",
mixer->num);
rc = -EINVAL;
goto error;
if (mdata->mdp_rev < MDSS_MDP_HW_REV_103) {
pr_err("More than one pipe staged on mixer num %d\n",
mixer->num);
rc = -EINVAL;
goto error;
} else if (mixer->stage_pipe[MDSS_MDP_STAGE_UNUSED + 1] !=
NULL) {
pr_err("More than two pipe staged on mixer num %d\n",
mixer->num);
rc = -EINVAL;
goto error;
} else {
right_blend = 1;
}
}
pr_debug("Staging pipe num %d on mixer num %d\n",
pipe->num, mixer->num);
mixer->stage_pipe[MDSS_MDP_STAGE_UNUSED] = pipe;
mixer->stage_pipe[MDSS_MDP_STAGE_UNUSED + right_blend] = pipe;
pipe->mixer_left = mixer;
pipe->mixer_stage = MDSS_MDP_STAGE_UNUSED;