summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorJayant Shekhar <jshekhar@codeaurora.org>2015-12-18 12:00:54 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:18:03 -0700
commit24f4f571847df67bc713d20fbfd2bca1737c36de (patch)
tree5231340fa05550dfad5a38c50ddbdd096f61dadc /drivers/video/fbdev/msm
parentd6d2450a7091b0900e65ece13569d43512415d9d (diff)
msm: mdss: Add mdss capabilities for msmtitanium
Add MDSS version info along with other capabilities for msmtitanium. Change-Id: If9544098e8bb7f4b0d8198a931e5a7ef8eb561d4 Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp.c1
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp.h10
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c
index 7545f56aae97..3735a6650f66 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@ -3832,6 +3832,7 @@ static void apply_dynamic_ot_limit(u32 *ot_lim,
switch (mdata->mdp_rev) {
case MDSS_MDP_HW_REV_114:
+ case MDSS_MDP_HW_REV_116:
if ((res <= RES_1080p) && (params->frame_rate <= 30))
*ot_lim = 2;
else if (params->is_rot && params->is_yuv)
diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h
index 17eac17b23cd..ce749316740e 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.h
+++ b/drivers/video/fbdev/msm/mdss_mdp.h
@@ -948,7 +948,11 @@ static inline bool mdss_mdp_req_init_restore_cfg(struct mdss_data_type *mdata)
IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
MDSS_MDP_HW_REV_108) ||
IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
- MDSS_MDP_HW_REV_112))
+ MDSS_MDP_HW_REV_112) ||
+ IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
+ MDSS_MDP_HW_REV_114) ||
+ IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
+ MDSS_MDP_HW_REV_116))
return true;
return false;
@@ -971,7 +975,9 @@ static inline int mdss_mdp_panic_signal_support_mode(
else if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
MDSS_MDP_HW_REV_107) ||
IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
- MDSS_MDP_HW_REV_114))
+ MDSS_MDP_HW_REV_114) ||
+ IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,
+ MDSS_MDP_HW_REV_116))
signal_mode = MDSS_MDP_PANIC_PER_PIPE_CFG;
return signal_mode;