evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: disable scaler for pipes with solid_fill"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-16 16:34:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit 000c6aebd7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/video/fbdev/msm/mdss_mdp_pipe.c
View file

@ -2690,6 +2690,16 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe,
if (pipe->scaler.enable)
mdss_mdp_pipe_program_pixel_extn(pipe);
ret = mdss_mdp_pipe_pp_setup(pipe, &opmode);
if (ret) {
pr_err("pipe pp setup error for pnum=%d\n", pipe->num);
MDSS_XLOG(pipe->num, pipe->mixer_left->num,
pipe->play_cnt, 0xbad);
goto done;
}
}
if ((!(pipe->flags & MDP_VPU_PIPE) && (src_data == NULL)) ||
@ -2708,12 +2718,6 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe,
if (params_changed) {
pipe->params_changed = 0;
ret = mdss_mdp_pipe_pp_setup(pipe, &opmode);
if (ret) {
pr_err("pipe pp setup error for pnum=%d\n", pipe->num);
goto done;
}
ret = mdss_mdp_image_setup(pipe, src_data);
if (ret) {
pr_err("image setup error for pnum=%d\n", pipe->num);