Detect both prototype and production FP2.5 display panels
The prototype FP2.5 display panel has a partially empty signature while
the production-ready panel has a new distinct signature. Make sure to
match the signature from both panels.
FPIIM-1423
Change-Id: I63de21cd9a36813764ad93268724fedcd841c24b
diff --git a/dev/gcdb/display/include/panel_s6d6fa1_1080p_video.h b/dev/gcdb/display/include/panel_s6d6fa1_1080p_video.h
index 4bd4ff7..f6e2fba 100644
--- a/dev/gcdb/display/include/panel_s6d6fa1_1080p_video.h
+++ b/dev/gcdb/display/include/panel_s6d6fa1_1080p_video.h
@@ -431,6 +431,7 @@
};
-#define S6D6FA1_1080P_VIDEO_SIGNATURE 0x210000
+#define S6D6FA1_1080P_VIDEO_SIGNATURE 0x21F500
+#define S6D6FA1_1080P_VIDEO_SIGNATURE_PROTO 0x210000
#endif /*_PANEL_S6D6FA1_1080P_VIDEO_H_*/
diff --git a/target/FP2/oem_panel.c b/target/FP2/oem_panel.c
index 23766d8..563e041 100755
--- a/target/FP2/oem_panel.c
+++ b/target/FP2/oem_panel.c
@@ -63,6 +63,7 @@
JDI_QHD_DUALDSI_CMD_PANEL,
OTM1902B_1080P_CMD_PANEL,
S6D6FA1_1080P_VIDEO_PANEL,
+S6D6FA1_1080P_VIDEO_PANEL_PROTO,
UNKNOWN_PANEL
};
@@ -79,6 +80,7 @@
{"jdi_qhd_dualdsi_cmd", JDI_QHD_DUALDSI_CMD_PANEL},
{"otm1902b_1080p_cmd",OTM1902B_1080P_CMD_PANEL},
{"s6d6fa1_1080p_video", S6D6FA1_1080P_VIDEO_PANEL},
+ {"s6d6fa1_1080p_video_proto", S6D6FA1_1080P_VIDEO_PANEL_PROTO},
};
static uint32_t panel_id;
@@ -255,6 +257,7 @@
pinfo->mipi.signature = OTM1902B_1080P_VIDEO_SIGNATURE;
break;
case S6D6FA1_1080P_VIDEO_PANEL:
+ case S6D6FA1_1080P_VIDEO_PANEL_PROTO:
panelstruct->paneldata = &s6d6fa1_1080p_video_panel_data;
panelstruct->panelres = &s6d6fa1_1080p_video_panel_res;
panelstruct->color = &s6d6fa1_1080p_video_color;
@@ -283,6 +286,9 @@
pinfo->mipi.signature = 0;
break;
}
+ if (S6D6FA1_1080P_VIDEO_PANEL_PROTO == panel_id) {
+ pinfo->mipi.signature = S6D6FA1_1080P_VIDEO_SIGNATURE_PROTO;
+ }
}
uint32_t oem_panel_max_auto_detect_panels()
@@ -328,9 +334,12 @@
panel_id = S6D6FA1_1080P_VIDEO_PANEL;
break;
case 1:
- panel_id = OTM1902B_1080P_CMD_PANEL;
+ panel_id = S6D6FA1_1080P_VIDEO_PANEL_PROTO;
break;
case 2:
+ panel_id = OTM1902B_1080P_CMD_PANEL;
+ break;
+ case 3:
panel_id = GENERIC_720P_CMD_PANEL;
break;
default: