diff options
| author | Dhaval Patel <pdhaval@codeaurora.org> | 2015-02-12 16:16:16 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:37:58 -0700 |
| commit | ff8a520372c7f1e5bc5f2ac9abddfc10054bbb7c (patch) | |
| tree | 68feef5053600cc193d9f933be0c153011e3e181 | |
| parent | 8ca05c66ba6654ba076f76893067e18d8dc86a49 (diff) | |
msm: mdss: fix z order for thulium target
Thulium target supports 8 layers z ordering for
MDP composition. Update MDP driver accordingly to
handle the layer z-orders.
Change-Id: I08fe1dfb6964a83eed6b1b7a2dfa86046db6f423
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_layer.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index d6213583cff6..9bf3079006ba 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -951,6 +951,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) { switch (mdata->mdp_rev) { case MDSS_MDP_HW_REV_105: + case MDSS_MDP_HW_REV_107: case MDSS_MDP_HW_REV_109: mdss_set_quirk(mdata, MDSS_QUIRK_BWCPANIC); mdata->max_target_zorder = 7; /* excluding base layer */ diff --git a/drivers/video/fbdev/msm/mdss_mdp_layer.c b/drivers/video/fbdev/msm/mdss_mdp_layer.c index c1f467048e8f..e01830903923 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_layer.c +++ b/drivers/video/fbdev/msm/mdss_mdp_layer.c @@ -118,7 +118,7 @@ static int __layer_param_check(struct msm_fb_data_type *mfd, } min_src_size = fmt->is_yuv ? 2 : 1; - if (layer->z_order >= mdata->max_target_zorder) { + if (layer->z_order >= (mdata->max_target_zorder + MDSS_MDP_STAGE_0)) { pr_err("zorder %d out of range\n", layer->z_order); return -EINVAL; } |