Unverified Commit 7a951e3a authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Remove call to drm_connector_unregister() 



drm_connector_unregister() is only to be used for connectors that have been
registered through drm_connector_register() after drm_dev_register() has
been called. This is our case here so let's remove the call.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-39-maxime@cerno.tech
parent b4f2c70c

drivers/gpu/drm/vc4/vc4_hdmi.c

+3 −9
Original line number Diff line number Diff line
@@ -267,12 +267,6 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) 
	return connector_status_disconnected;

}



static void vc4_hdmi_connector_destroy(struct drm_connector *connector)

{

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);

}



static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)

{

	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
@@ -380,7 +374,7 @@ vc4_hdmi_connector_duplicate_state(struct drm_connector *connector) 
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {

	.detect = vc4_hdmi_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = vc4_hdmi_connector_destroy,

	.destroy = drm_connector_cleanup,

	.reset = vc4_hdmi_connector_reset,

	.atomic_duplicate_state = vc4_hdmi_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -3022,7 +3016,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
err_free_hotplug:

	vc4_hdmi_hotplug_exit(vc4_hdmi);

err_destroy_conn:

	vc4_hdmi_connector_destroy(&vc4_hdmi->connector);

	drm_connector_cleanup(&vc4_hdmi->connector);

err_destroy_encoder:

	drm_encoder_cleanup(encoder);

	pm_runtime_put_sync(dev);
@@ -3066,7 +3060,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, 
	vc4_hdmi_audio_exit(vc4_hdmi);

	vc4_hdmi_cec_exit(vc4_hdmi);

	vc4_hdmi_hotplug_exit(vc4_hdmi);

	vc4_hdmi_connector_destroy(&vc4_hdmi->connector);

	drm_connector_cleanup(&vc4_hdmi->connector);

	drm_encoder_cleanup(&vc4_hdmi->encoder.base);



	pm_runtime_disable(dev);