[Intel-gfx] [PATCH 2/2] drm/i915: Drop the eDP check from intel_dp_connector_destroy()

Ville Syrjala ville.syrjala at linux.intel.com
Mon Oct 8 13:46:41 UTC 2018


From: Ville Syrjälä <ville.syrjala at linux.intel.com>

As long as the connector was zeroed during allocation calling
intel_panel_fini() is safe even if we haven't initialized
the panel struct explicitly. So let's drop the useless eDP
check from dp connector destruction.

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 19f0c3f59cbe..d12f987a6c43 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5261,12 +5261,7 @@ intel_dp_connector_destroy(struct drm_connector *connector)
 	if (!IS_ERR_OR_NULL(intel_connector->edid))
 		kfree(intel_connector->edid);
 
-	/*
-	 * Can't call intel_dp_is_edp() since the encoder may have been
-	 * destroyed already.
-	 */
-	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
-		intel_panel_fini(&intel_connector->panel);
+	intel_panel_fini(&intel_connector->panel);
 
 	drm_connector_cleanup(connector);
 	kfree(connector);
-- 
2.16.4



More information about the Intel-gfx mailing list