[PATCH 3/3] more debug

[José Roberto de Souza]

---
 drivers/gpu/drm/i915/display/intel_bios.c | 16 ++++++++++++++--
 drivers/gpu/drm/i915/display/vlv_dsi.c    |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 45d332b1b6f41..217a2ff573468 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1879,17 +1879,29 @@ static void parse_lfp(struct drm_i915_private *i915,
 {
 	const struct vbt_header *vbt = i915->opregion.vbt;
 	const struct bdb_header *bdb;
-	int lfp_inst, panel_index;
+	int lfp_inst = 0, panel_index;
+	enum port port = dvo_port_to_port(i915, devdata->child.dvo_port);
+	int ret;
 
 	if (devdata->child.handle == HANDLE_LFP_1)
 		lfp_inst = 1;
 	else if (devdata->child.handle == HANDLE_LFP_2)
 		lfp_inst = 2;
-	else
+
+	drm_info(&i915->drm, "parse_lfp port%c lfp_inst=%i\n", port_name(port), lfp_inst);
+
+	if (lfp_inst == 0)
 		return;
 
 	bdb = get_bdb_header(vbt);
 	panel_index = get_lfp_panel_index(i915, bdb, lfp_inst);
+	drm_info(&i915->drm, "\tpanel_index=%i\n", panel_index);
+
+	ret = intel_opregion_get_panel_type(i915);
+	if (ret >= 0) {
+		drm_info(&i915->drm, "\tpanel_index using old method: %d (OpRegion)\n", ret);
+	}
+
 	if (panel_index == -1)
 		return;
 
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 7c76b0c2d1f8c..fa86bbc098bfc 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1871,7 +1871,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 
 	drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
 			 "DSI %c", port_name(port));
-	drm_dbg_kms(&dev_priv->drm, "1.1\n");
+	drm_dbg_kms(&dev_priv->drm, "1.1 port%c\n", port_name(port));
 
 	intel_encoder->compute_config = intel_dsi_compute_config;
 	intel_encoder->pre_enable = intel_dsi_pre_enable;
@@ -1904,10 +1904,10 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 	else
 		intel_encoder->pipe_mask = BIT(PIPE_B);
 
-	drm_dbg_kms(&dev_priv->drm, "1.4\n");
+	drm_dbg_kms(&dev_priv->drm, "1.4 dev_priv->vbt.dsi.config=%px\n", dev_priv->vbt.dsi.config);
 	intel_dsi->panel_power_off_time = ktime_get_boottime();
 
-	if (dev_priv->vbt.dsi.config->dual_link)
+	if (dev_priv->vbt.dsi.config && dev_priv->vbt.dsi.config->dual_link)
 		intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);
 	else
 		intel_dsi->ports = BIT(port);
-- 
2.32.0