Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b26e4f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: add a common connector type independent destroy hook 



Almost all of the connector destroy functions do the same thing. The
differences are in the edid, detect_edid and panel cleanups, but those
are safely NULL when not initialized. Roll out a common connector
destroy hook.

Inspired by commit bc3213c4 ("drm/i915: Drop the eDP check from
intel_dp_connector_destroy()").

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181009141103.20387-1-jani.nikula@intel.com
parent a9f9ca33

drivers/gpu/drm/i915/intel_crt.c

+1 −7
Original line number Diff line number Diff line
@@ -849,12 +849,6 @@ intel_crt_detect(struct drm_connector *connector, 
	return status;

}



static void intel_crt_destroy(struct drm_connector *connector)

{

	drm_connector_cleanup(connector);

	kfree(connector);

}



static int intel_crt_get_modes(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;
@@ -909,7 +903,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
	.fill_modes = drm_helper_probe_single_connector_modes,

	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_crt_destroy,

	.destroy = intel_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

};

drivers/gpu/drm/i915/intel_display.c

+19 −1
Original line number Diff line number Diff line
@@ -6365,7 +6365,7 @@ struct intel_connector *intel_connector_alloc(void) 
 * This should only be used after intel_connector_alloc has returned

 * successfully, and before drm_connector_init returns successfully.

 * Otherwise the destroy callbacks for the connector and the state should

 * take care of proper cleanup/free

 * take care of proper cleanup/free (see intel_connector_destroy).

 */

void intel_connector_free(struct intel_connector *connector)

{
@@ -6373,6 +6373,24 @@ void intel_connector_free(struct intel_connector *connector) 
	kfree(connector);

}



/*

 * Connector type independent destroy hook for drm_connector_funcs.

 */

void intel_connector_destroy(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	kfree(intel_connector->detect_edid);



	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	intel_panel_fini(&intel_connector->panel);



	drm_connector_cleanup(connector);

	kfree(connector);

}



/* Simple connector->get_hw_state implementation for encoders that support only

 * one connector and no cloning and hence the encoder state determines the state

 * of the connector. */

drivers/gpu/drm/i915/intel_dp.c

+1 −17
Original line number Diff line number Diff line
@@ -5251,22 +5251,6 @@ intel_dp_connector_unregister(struct drm_connector *connector) 
	intel_connector_unregister(connector);

}



static void

intel_dp_connector_destroy(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	kfree(intel_connector->detect_edid);



	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	intel_panel_fini(&intel_connector->panel);



	drm_connector_cleanup(connector);

	kfree(connector);

}



void intel_dp_encoder_destroy(struct drm_encoder *encoder)

{

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
@@ -5613,7 +5597,7 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { 
	.atomic_set_property = intel_digital_connector_atomic_set_property,

	.late_register = intel_dp_connector_register,

	.early_unregister = intel_dp_connector_unregister,

	.destroy = intel_dp_connector_destroy,

	.destroy = intel_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = intel_digital_connector_duplicate_state,

};

drivers/gpu/drm/i915/intel_dp_mst.c

+1 −13
Original line number Diff line number Diff line
@@ -335,24 +335,12 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force) 
				      intel_connector->port);

}



static void

intel_dp_mst_connector_destroy(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	drm_connector_cleanup(connector);

	kfree(connector);

}



static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {

	.detect = intel_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_dp_mst_connector_destroy,

	.destroy = intel_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

};

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1510,6 +1510,7 @@ void intel_encoder_destroy(struct drm_encoder *encoder); 
int intel_connector_init(struct intel_connector *);

struct intel_connector *intel_connector_alloc(void);

void intel_connector_free(struct intel_connector *connector);

void intel_connector_destroy(struct drm_connector *connector);

bool intel_connector_get_hw_state(struct intel_connector *connector);

void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder);