dv: add dv node info for 4.9. [1/1]

PD# 157605

Change-Id: I86ab524173264e482e2a5cfafc1c0c6abf659d40
dv: add dv node info for 4.9.

2 files changed, 16 insertions, 4 deletions

diff --git a/frameworks/services/systemcontrol/DisplayMode.cpp b/frameworks/services/systemcontrol/DisplayMode.cpp
index 0f0dd23..94556f2 100644
--- a/frameworks/services/systemcontrol/DisplayMode.cpp
+++ b/frameworks/services/systemcontrol/DisplayMode.cpp
@@ -1319,6 +1319,7 @@ void DisplayMode::setDolbyVisionEnable(int state) {
         //if TV
         if (DISPLAY_TYPE_TV == mDisplayType) {
             setHdrMode(HDR_MODE_OFF);
+            pSysWrite->writeSysfs(DOLBY_VISION_POLICY_OLD, DV_POLICY_FOLLOW_SOURCE);
             pSysWrite->writeSysfs(DOLBY_VISION_POLICY, DV_POLICY_FOLLOW_SOURCE);
         }
 
@@ -1335,11 +1336,15 @@ void DisplayMode::setDolbyVisionEnable(int state) {
                     setSourceOutputMode(mode);
                 }
             }
+            pSysWrite->writeSysfs(DOLBY_VISION_POLICY_OLD, DV_POLICY_FOLLOW_SOURCE);
+            pSysWrite->writeSysfs(DOLBY_VISION_HDR10_POLICY_OLD, DV_POLICY_FOLLOW_SOURCE);
             pSysWrite->writeSysfs(DOLBY_VISION_POLICY, DV_POLICY_FOLLOW_SINK);
             pSysWrite->writeSysfs(DOLBY_VISION_HDR10_POLICY, DV_HDR10_POLICY);
         }
 
         usleep(100000);//100ms
+        pSysWrite->writeSysfs(DOLBY_VISION_ENABLE_OLD, DV_ENABLE);
+        pSysWrite->writeSysfs(DOLBY_VISION_MODE_OLD, DV_MODE_IPT_TUNNEL);
         pSysWrite->writeSysfs(DOLBY_VISION_ENABLE, DV_ENABLE);
         pSysWrite->writeSysfs(DOLBY_VISION_MODE, DV_MODE_IPT_TUNNEL);
         pSysWrite->setProperty(PROP_DOLBY_VISION_ENABLE, "true");
@@ -1355,9 +1360,12 @@ void DisplayMode::setDolbyVisionEnable(int state) {
     } else {
         if (!dvStatus)
             pSysWrite->writeSysfs(DISPLAY_HDMI_AVMUTE, "1");
+        pSysWrite->writeSysfs(DOLBY_VISION_POLICY_OLD, DV_POLICY_FORCE_MODE);
+        pSysWrite->writeSysfs(DOLBY_VISION_MODE_OLD, DV_MODE_BYPASS);
         pSysWrite->writeSysfs(DOLBY_VISION_POLICY, DV_POLICY_FORCE_MODE);
         pSysWrite->writeSysfs(DOLBY_VISION_MODE, DV_MODE_BYPASS);
         usleep(100000);//100ms
+        pSysWrite->writeSysfs(DOLBY_VISION_ENABLE_OLD, DV_DISABLE);
         pSysWrite->writeSysfs(DOLBY_VISION_ENABLE, DV_DISABLE);
         pSysWrite->setProperty(PROP_DOLBY_VISION_ENABLE, "false");
         if (DISPLAY_TYPE_TV == mDisplayType) {
diff --git a/frameworks/services/systemcontrol/DisplayMode.h b/frameworks/services/systemcontrol/DisplayMode.h
index 8927289..0b9be71 100644
--- a/frameworks/services/systemcontrol/DisplayMode.h
+++ b/frameworks/services/systemcontrol/DisplayMode.h
@@ -134,10 +134,14 @@ using namespace android;
 #define HDMI_TX_HDMI_AUDIO_UEVENT       "DEVPATH=/devices/virtual/amhdmitx/amhdmitx0/hdmi_audio"
 
 //dolby vision sysfs
-#define DOLBY_VISION_POLICY             "/sys/module/am_vecm/parameters/dolby_vision_policy"
-#define DOLBY_VISION_HDR10_POLICY       "/sys/module/am_vecm/parameters/dolby_vision_hdr10_policy"
-#define DOLBY_VISION_ENABLE             "/sys/module/am_vecm/parameters/dolby_vision_enable"
-#define DOLBY_VISION_MODE               "/sys/class/amvecm/dv_mode"
+#define DOLBY_VISION_POLICY_OLD         "/sys/module/am_vecm/parameters/dolby_vision_policy"
+#define DOLBY_VISION_HDR10_POLICY_OLD   "/sys/module/am_vecm/parameters/dolby_vision_hdr10_policy"
+#define DOLBY_VISION_ENABLE_OLD         "/sys/module/am_vecm/parameters/dolby_vision_enable"
+#define DOLBY_VISION_MODE_OLD           "/sys/class/amvecm/dv_mode"
+#define DOLBY_VISION_POLICY             "/sys/module/amdolby_vision/parameters/dolby_vision_policy"
+#define DOLBY_VISION_HDR10_POLICY       "/sys/module/amdolby_vision/parameters/dolby_vision_hdr10_policy"
+#define DOLBY_VISION_ENABLE             "/sys/module/amdolby_vision/parameters/dolby_vision_enable"
+#define DOLBY_VISION_MODE               "/sys/class/amdolby_vision/dv_mode"
 #define DOLBY_VISION_IS_SUPPORT         "/sys/class/amhdmitx/amhdmitx0/dv_cap"
 
 #define DOLBY_VISION_SET_ENABLE         1