msm: display: Use local HDMI as primary flags for 8960/8064 targets
Replace the global flag for HDMI as primary flag by local ones to
8960 and 8064 targets to avoid compilation issues for separate
target configs enabled
CRs-Fixed: 344144
Change-Id: I545cb46f51ed32e036fc2de3946e8a4b7a9d93e4
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064-display.c b/arch/arm/mach-msm/board-8064-display.c
index 6949b62..19d7a9e 100644
--- a/arch/arm/mach-msm/board-8064-display.c
+++ b/arch/arm/mach-msm/board-8064-display.c
@@ -82,6 +82,17 @@
#define HDMI_PANEL_NAME "hdmi_msm"
#define TVOUT_PANEL_NAME "tvout_msm"
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+static unsigned char hdmi_is_primary = 1;
+#else
+static unsigned char hdmi_is_primary;
+#endif
+
+unsigned char apq8064_hdmi_as_primary_selected(void)
+{
+ return hdmi_is_primary;
+}
+
static void set_mdp_clocks_for_wuxga(void);
static int msm_fb_detect_panel(const char *name)
@@ -116,7 +127,7 @@
if (!strncmp(name, HDMI_PANEL_NAME,
strnlen(HDMI_PANEL_NAME,
PANEL_NAME_MAX_LEN))) {
- if (hdmi_is_primary)
+ if (apq8064_hdmi_as_primary_selected())
set_mdp_clocks_for_wuxga();
return 0;
}
@@ -958,7 +969,7 @@
for (i = 0; i < ARRAY_SIZE(mdp_core_clk_rate_table); i++)
mdp_core_clk_rate_table[i] = 200000000;
- if (hdmi_is_primary) {
+ if (apq8064_hdmi_as_primary_selected()) {
dtv_bus_def_vectors[0].ab = 2000000000;
dtv_bus_def_vectors[0].ib = 2000000000;
}