msm: mdss: compare destination roi to mixer height

Trying to compare layer height to mixer height if possible,
otherwise defaulting to fb var screen info.

Change-Id: Ic0471446e88a956c5120f6c30d00e3c6f391a3d4
Signed-off-by: Terence Hampson <thampson@codeaurora.org>
[cip@codeaurora.org: Resolved merge conflict]
Signed-off-by: Clarence Ip <cip@codeaurora.org>
This commit is contained in:
Terence Hampson 2015-06-02 17:20:02 -04:00 committed by David Keitel
parent c040ba96c0
commit f274a1ebec

View file

@ -165,7 +165,17 @@ static int __layer_param_check(struct msm_fb_data_type *mfd,
struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
u32 src_w, src_h, dst_w, dst_h;
yres = mfd->fbi->var.yres;
if (!ctl) {
pr_err("ctl is null\n");
return -EINVAL;
}
if (ctl->mixer_left) {
yres = ctl->mixer_left->height;
} else {
pr_debug("Using fb var screen infor for height\n");
yres = mfd->fbi->var.yres;
}
content_secure = (layer->flags & MDP_LAYER_SECURE_SESSION);
if (!ctl->is_secure && content_secure &&