platform: msm_shared: Update MDP5 for msmtitanium support
This change updates MDP5 with the new MDSS_MDP version checks
and adds display files for compilation.
Change-Id: I368ccaf6ff6485a25e284b6478c6f0b998b56608
diff --git a/platform/msm_shared/include/mdp5.h b/platform/msm_shared/include/mdp5.h
index ebf107b..9353688 100644
--- a/platform/msm_shared/include/mdp5.h
+++ b/platform/msm_shared/include/mdp5.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -94,6 +94,7 @@
#define MDSS_MDP_HW_REV_111 MDSS_MDP_REV(1, 11, 0) /* 8956 v1.0 */
#define MDSS_MDP_HW_REV_112 MDSS_MDP_REV(1, 12, 0) /* 8952 v1.0 */
#define MDSS_MDP_HW_REV_114 MDSS_MDP_REV(1, 14, 0) /* 8937 v1.0 */
+#define MDSS_MDP_HW_REV_116 MDSS_MDP_REV(1, 16, 0) /* msmtitanium */
#define MDSS_MDP_HW_REV_200 MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */
#define MDSS_MAX_LINE_BUF_WIDTH 2048
diff --git a/platform/msm_shared/mdp5.c b/platform/msm_shared/mdp5.c
index 77a23da..89f7961 100755
--- a/platform/msm_shared/mdp5.c
+++ b/platform/msm_shared/mdp5.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -61,14 +61,16 @@
{
return (MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
MDSS_MDP_HW_REV_107) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
- MDSS_MDP_HW_REV_114));
+ MDSS_MDP_HW_REV_114) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
+ MDSS_MDP_HW_REV_116));
}
static inline bool has_fixed_size_smp()
{
return (MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
MDSS_MDP_HW_REV_107) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
- MDSS_MDP_HW_REV_114));
+ MDSS_MDP_HW_REV_114) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
+ MDSS_MDP_HW_REV_116));
}
uint32_t mdss_mdp_intf_offset()
@@ -80,7 +82,8 @@
(mdss_mdp_rev == MDSS_MDP_HW_REV_108) ||
(mdss_mdp_rev == MDSS_MDP_HW_REV_111) ||
(mdss_mdp_rev == MDSS_MDP_HW_REV_112) ||
- (mdss_mdp_rev == MDSS_MDP_HW_REV_114))
+ (mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
+ (mdss_mdp_rev == MDSS_MDP_HW_REV_116))
mdss_mdp_intf_off = 0x59100;
else if (mdss_mdp_rev >= MDSS_MDP_HW_REV_102)
mdss_mdp_intf_off = 0;
@@ -115,7 +118,8 @@
if ((mdss_mdp_rev == MDSS_MDP_HW_REV_110) ||
(mdss_mdp_rev == MDSS_MDP_HW_REV_111) ||
- (mdss_mdp_rev == MDSS_MDP_HW_REV_114))
+ (mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
+ (mdss_mdp_rev == MDSS_MDP_HW_REV_116))
return 0xB0020;
else if (MDSS_IS_MAJOR_MINOR_MATCHING(mdss_mdp_rev, MDSS_MDP_HW_REV_107))
return 0xB0000;
@@ -213,6 +217,7 @@
MDSS_IS_MAJOR_MINOR_MATCHING(mdss_mdp_rev,
MDSS_MDP_HW_REV_107) ||
(mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
+ (mdss_mdp_rev == MDSS_MDP_HW_REV_116) ||
(mdss_mdp_rev == MDSS_MDP_HW_REV_110)) {
if (pinfo->dest == DISPLAY_2) {
*ctl0_reg_val |= BIT(29);
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 2bfc931..eebd8c9 100755
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -617,6 +617,7 @@
endif
ifeq ($(PLATFORM),msmtitanium)
+DEFINES += DISPLAY_TYPE_MDSS=1
OBJS += $(LOCAL_DIR)/qgic.o \
$(LOCAL_DIR)/qtimer.o \
$(LOCAL_DIR)/qtimer_mmap.o \
@@ -641,7 +642,13 @@
$(LOCAL_DIR)/crypto5_eng.o \
$(LOCAL_DIR)/qmp_usb30_phy.o \
$(LOCAL_DIR)/qusb2_phy.o \
- $(LOCAL_DIR)/crypto5_wrapper.o
+ $(LOCAL_DIR)/crypto5_wrapper.o \
+ $(LOCAL_DIR)/mdp5.o \
+ $(LOCAL_DIR)/display.o \
+ $(LOCAL_DIR)/mipi_dsi.o \
+ $(LOCAL_DIR)/mipi_dsc.o \
+ $(LOCAL_DIR)/mipi_dsi_phy.o \
+ $(LOCAL_DIR)/mipi_dsi_autopll_thulium.o
endif
ifeq ($(ENABLE_BOOT_CONFIG_SUPPORT), 1)