commit 2dac9a264845e3f62817260383d68e1d96a6e12b
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 23 05:05:15 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 23 05:05:15 2015 -0700
tree 8b005df0ef29ea8cb3736cb61cfcf85db3ab84ea
parent e61d8a6a585229727155c55085f2957ecd5162c8
parent bf6ce7d2fd248ec5bab0707bdfb0467ac0e1606f

Merge "platform: msm_shared: Fix potential buffer overflow"

dev/gcdb/display/include/panel_r69006_1080p_cmd.h

diff --git a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
index ed96942..21bf993 100755
--- a/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_cmd.h
@@ -90,7 +90,7 @@
 };
 
 static char r69006_1080p_cmd_on_cmd5[] = {
-	0X36, 0x90, 0x15, 0x80
+	0X36, 0x98, 0x15, 0x80
 };
 
 static char r69006_1080p_cmd_on_cmd6[] = {
@@ -212,11 +212,11 @@
 };
 
 static char r69006_1080p_cmd_on_cmd21[] = {
-	0x29, 0x00, 0x05, 0x80
+	0x11, 0x00, 0x05, 0x80
 };
 
 static char r69006_1080p_cmd_on_cmd22[] = {
-	0x11, 0x00, 0x05, 0x80
+	0x29, 0x00, 0x05, 0x80
 };
 
 static struct mipi_dsi_cmd r69006_1080p_cmd_on_command[] = {
@@ -314,4 +314,6 @@
 	1, 1, 4095, 100, 1, "PMIC_8941"
 };
 
+#define R69006_1080P_CMD_SIGNATURE 0xFFFF
+
 #endif /*_PANEL_R69006_1080P_CMD_H_*/

dev/gcdb/display/include/panel_r69006_1080p_video.h

diff --git a/dev/gcdb/display/include/panel_r69006_1080p_video.h b/dev/gcdb/display/include/panel_r69006_1080p_video.h
index 205df55..e9c5d26 100755
--- a/dev/gcdb/display/include/panel_r69006_1080p_video.h
+++ b/dev/gcdb/display/include/panel_r69006_1080p_video.h
@@ -90,7 +90,7 @@
 };
 
 static char r69006_1080p_video_on_cmd5[] = {
-	0X36, 0x90, 0x15, 0x80
+	0X36, 0x98, 0x15, 0x80
 };
 
 static char r69006_1080p_video_on_cmd6[] = {
@@ -212,11 +212,11 @@
 };
 
 static char r69006_1080p_video_on_cmd21[] = {
-	0x29, 0x00, 0x05, 0x80
+	0x11, 0x00, 0x05, 0x80
 };
 
 static char r69006_1080p_video_on_cmd22[] = {
-	0x11, 0x00, 0x05, 0x80
+	0x29, 0x00, 0x05, 0x80
 };
 
 static struct mipi_dsi_cmd r69006_1080p_video_on_command[] = {
@@ -314,4 +314,6 @@
 	1, 1, 4095, 100, 1, "PMIC_8941"
 };
 
+#define R69006_1080P_VIDEO_SIGNATURE 0xFFFF
+
 #endif /*_PANEL_R69006_1080P_VIDEO_H_*/

target/msm8996/target_display.c

diff --git a/target/msm8996/target_display.c b/target/msm8996/target_display.c
index 412f93b..439ec14 100644
--- a/target/msm8996/target_display.c
+++ b/target/msm8996/target_display.c
@@ -106,6 +106,7 @@
 {
 	uint32_t pll_locked;
 
+	writel(0x10, phy_base + 0x45c);
 	writel(0x01, phy_base + 0x48);
 	dmb();