drm/i915: Drop the eDP check from intel_dp_connector_destroy()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 8 Oct 2018 13:46:41 +0000 (16:46 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 9 Oct 2018 13:35:22 +0000 (16:35 +0300)
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20181008134641.24868-2-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_dp.c

index 19f0c3f..d12f987 100644 (file)
@@ -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);