diff options
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.h | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pipe.c | 1 | ||||
| -rw-r--r-- | include/uapi/linux/msm_mdp.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index 6821a8b5d7d6..040ef4c3a471 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -1060,6 +1060,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_109: case MDSS_MDP_HW_REV_110: mdata->max_target_zorder = MDSS_MDP_MAX_STAGE; mdata->max_cursor_size = 128; diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h index 91657af4c31c..7c0449284c16 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.h +++ b/drivers/video/fbdev/msm/mdss_mdp.h @@ -620,7 +620,9 @@ static inline int mdss_mdp_panic_signal_support_mode( if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_105) || IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, - MDSS_MDP_HW_REV_108)) + MDSS_MDP_HW_REV_108) || + IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, + MDSS_MDP_HW_REV_109)) signal_mode = MDSS_MDP_PANIC_COMMON_REG_CFG; else if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_107)) diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index ddab01c98bac..cf20254c44c1 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -492,6 +492,7 @@ static inline bool is_unused_smp_allowed(void) switch (MDSS_GET_MAJOR_MINOR(mdata->mdp_rev)) { case MDSS_GET_MAJOR_MINOR(MDSS_MDP_HW_REV_103): case MDSS_GET_MAJOR_MINOR(MDSS_MDP_HW_REV_105): + case MDSS_GET_MAJOR_MINOR(MDSS_MDP_HW_REV_109): return true; default: return false; diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h index cf3a03869369..9095d91bc232 100644 --- a/include/uapi/linux/msm_mdp.h +++ b/include/uapi/linux/msm_mdp.h @@ -103,6 +103,7 @@ #define MDSS_MDP_HW_REV_106 MDSS_MDP_REV(1, 6, 0) /* 8916 v1.0 */ #define MDSS_MDP_HW_REV_107 MDSS_MDP_REV(1, 7, 0) #define MDSS_MDP_HW_REV_108 MDSS_MDP_REV(1, 8, 0) /* 8939 v1.0 */ +#define MDSS_MDP_HW_REV_109 MDSS_MDP_REV(1, 9, 0) /* 8994 v2.0 */ #define MDSS_MDP_HW_REV_110 MDSS_MDP_REV(1, 10, 0) /* 8992 v1.0 */ #define MDSS_MDP_HW_REV_200 MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */ |