summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSravan Kumar D.V.N <sravank1@codeaurora.org>2016-12-06 20:41:38 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 22:14:26 -0800
commitda5c2e07e74d4e4d1f9548a22461b7eb1c46fae8 (patch)
tree5b38b7dd2a6b56496b9fcee7f69319674308e204
parent243d79cf40ca1d87621f84ab0ca13f96aa89dc0d (diff)
msm: mdss: Initialize mdss v3 pp driver ops for msmfalcon
Define MDSS hw version and initialize mdss v3 pp driver ops for msmfalcon CRs-Fixed: 1102841 Change-Id: I2661a639c19dd451f22c9a29d7d75d9b3fb98114 Signed-off-by: Sravan Kumar D.V.N <sravank1@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c4
-rw-r--r--include/uapi/linux/msm_mdp.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 5a8438caba4b..238e4466b299 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -1123,7 +1123,8 @@ static int pp_vig_pipe_setup(struct mdss_mdp_pipe *pipe, u32 *op)
mdss_mdp_pp_get_dcm_state(pipe, &dcm_state);
mdata = mdss_mdp_get_mdata();
- if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_301) ||
+ if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_320) ||
+ IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_301) ||
IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_300)) {
if (pipe->src_fmt->is_yuv) {
/* TODO: check csc cfg from PP block */
@@ -7663,6 +7664,7 @@ static int pp_get_driver_ops(struct mdp_pp_driver_ops *ops)
break;
case MDSS_MDP_HW_REV_300:
case MDSS_MDP_HW_REV_301:
+ case MDSS_MDP_HW_REV_320:
/*
* Some of the REV_300 PP features are same as REV_107.
* Get the driver ops for both the versions and update the
diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h
index 20b879c2e5fc..4df3845c159c 100644
--- a/include/uapi/linux/msm_mdp.h
+++ b/include/uapi/linux/msm_mdp.h
@@ -118,6 +118,7 @@
#define MDSS_MDP_HW_REV_116 MDSS_MDP_REV(1, 16, 0) /* msmtitanium */
#define MDSS_MDP_HW_REV_300 MDSS_MDP_REV(3, 0, 0) /* msm8998 */
#define MDSS_MDP_HW_REV_301 MDSS_MDP_REV(3, 0, 1) /* msm8998 v1.0 */
+#define MDSS_MDP_HW_REV_320 MDSS_MDP_REV(3, 2, 0) /* msmfalcon */
enum {
NOTIFY_UPDATE_INIT,