[Intel-gfx] [PATCH v1] drm/i915: Call intel_edp_init_connector only for eDP.

Stanislav Lisovskiy stanislav.lisovskiy at intel.com
Tue Feb 11 11:40:38 UTC 2020


I guess it would still be nice to make the code less confusing
and do not call eDP specific function, for non-eDP connectors
just to immediately return true(success) value as a hack.

So simply extracted that check out from this function,
that we simply don't call it for non-eDP connectors. Bingo.

Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index f4dede6253f8..9bd36197a43d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7370,9 +7370,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
 	intel_wakeref_t wakeref;
 	struct edid *edid;
 
-	if (!intel_dp_is_edp(intel_dp))
-		return true;
-
 	INIT_DELAYED_WORK(&intel_dp->panel_vdd_work, edp_panel_vdd_work);
 
 	/*
@@ -7590,10 +7587,12 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 	intel_dp_mst_encoder_init(intel_dig_port,
 				  intel_connector->base.base.id);
 
-	if (!intel_edp_init_connector(intel_dp, intel_connector)) {
-		intel_dp_aux_fini(intel_dp);
-		intel_dp_mst_encoder_cleanup(intel_dig_port);
-		goto fail;
+	if (intel_dp_is_edp(intel_dp)) {
+		if (!intel_edp_init_connector(intel_dp, intel_connector)) {
+			intel_dp_aux_fini(intel_dp);
+			intel_dp_mst_encoder_cleanup(intel_dig_port);
+			goto fail;
+		}
 	}
 
 	intel_dp_add_properties(intel_dp, connector);
-- 
2.24.1.485.gad05a3d8e5



More information about the Intel-gfx mailing list