From c831c0679e47bc3fc12bb0f504c904926a13da40 Mon Sep 17 00:00:00 2001 From: Manasi Navare Date: Wed, 27 Mar 2019 15:59:06 -0700 Subject: [PATCH v2] drm/i915: Debug eDP Quirk patch Signed-off-by: Manasi Navare --- drivers/gpu/drm/drm_edid.c | 4 +++- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 4bfbc6e30e5f..96689143a8b2 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4760,8 +4760,10 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) if (quirks & EDID_QUIRK_FORCE_12BPC) connector->display_info.bpc = 12; - if (quirks & EDID_QUIRK_FORCE_MAX_LANE_COUNT) + if (quirks & EDID_QUIRK_FORCE_MAX_LANE_COUNT) { + DRM_DEBUG_KMS("\n eDP Debug: eDP 1.4 SHP panle quirk present"); connector->display_info.force_max_lane_count = true; + } return num_modes; } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 15c32be81979..ea9d4a0d4262 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2036,6 +2036,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, if (intel_dp->edp_force_max_lane_count || (intel_dp_is_edp(intel_dp) && intel_dp->edp_dpcd[0] < DP_EDP_14)) { + DRM_DEBUG_KMS("\neDP Debug: Using max lane count = %d", limits.max_lane_count); /* * Use the maximum clock and number of lanes the eDP panel * advertizes being capable of. The eDP 1.3 and earlier panels @@ -7096,11 +7097,15 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, mutex_lock(&dev->mode_config.mutex); edid = drm_get_edid(connector, &intel_dp->aux.ddc); if (edid) { + DRM_DEBUG_KMS("\neDP Debug: Got EDID for eDP"); if (drm_add_edid_modes(connector, edid)) { + DRM_DEBUG_KMS("\neDP Debug: Quirk = %d", connector->display_info.force_max_lane_count); drm_connector_update_edid_property(connector, edid); - if (connector->display_info.force_max_lane_count) + if (connector->display_info.force_max_lane_count) { intel_dp->edp_force_max_lane_count = true; + DRM_DEBUG_KMS("\neDP Debug: Setting edp for max lane count to true"); + } } else { kfree(edid); edid = ERR_PTR(-EINVAL); -- 2.19.1