diff mbox series

[2/2] drm/i915: Drop the eDP check from intel_dp_connector_destroy()

Message ID 20181008134641.24868-2-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915: Do intel_panel_destroy_backlight() later | expand

Commit Message

Ville Syrjälä Oct. 8, 2018, 1:46 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@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@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Chris Wilson Oct. 8, 2018, 2:22 p.m. UTC | #1 
Quoting Ville Syrjala (2018-10-08 14:46:41)
> From: Ville Syrjälä <ville.syrjala@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@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
diff mbox series

Patch

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);