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

Commit c191eca1 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Move intel_connector->unregister to connector->early_unregister 



We now have a connector->func that serves the same purpose as our own
intel_connector->unregister vfunc allowing us to unwrap ourselves and
use drm_connector_register() (and friends) as the central function.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466160034-12173-2-git-send-email-chris@chris-wilson.co.uk
parent bee7fb15

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3673,7 +3673,7 @@ extern void intel_modeset_init_hw(struct drm_device *dev); 
extern void intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_gem_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

extern void intel_connector_unregister(struct intel_connector *);

extern void intel_connector_unregister(struct drm_connector *);

extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);

extern void intel_display_resume(struct drm_device *dev);

extern void i915_redisable_vga(struct drm_device *dev);

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_crt_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_crt_destroy,

	.set_property = intel_crt_set_property,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -875,7 +876,6 @@ void intel_crt_init(struct drm_device *dev) 
		crt->base.get_hw_state = intel_crt_get_hw_state;

	}

	intel_connector->get_hw_state = intel_connector_get_hw_state;

	intel_connector->unregister = intel_connector_unregister;



	drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);

drivers/gpu/drm/i915/intel_display.c

+2 −8
Original line number Diff line number Diff line
@@ -16219,18 +16219,14 @@ void intel_modeset_gem_init(struct drm_device *dev) 
	intel_backlight_register(dev);

}



void intel_connector_unregister(struct intel_connector *intel_connector)

void intel_connector_unregister(struct drm_connector *connector)

{

	struct drm_connector *connector = &intel_connector->base;



	intel_panel_destroy_backlight(connector);

	drm_connector_unregister(connector);

}



void intel_modeset_cleanup(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_connector *connector;



	intel_disable_gt_powersave(dev_priv);
@@ -16256,9 +16252,7 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	/* flush any delayed tasks or pending work */

	flush_scheduled_work();



	/* destroy the backlight and sysfs files before encoders/connectors */

	for_each_intel_connector(dev, connector)

		connector->unregister(connector);

	drm_connector_unregister_all(dev);



	drm_mode_config_cleanup(dev);

drivers/gpu/drm/i915/intel_dp.c

+10 −11
Original line number Diff line number Diff line
@@ -1177,7 +1177,6 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) 
static void

intel_dp_aux_fini(struct intel_dp *intel_dp)

{

	drm_dp_aux_unregister(&intel_dp->aux);

	kfree(intel_dp->aux.name);

}
@@ -1212,15 +1211,6 @@ intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector) 
	return 0;

}



static void

intel_dp_connector_unregister(struct intel_connector *intel_connector)

{

	struct intel_dp *intel_dp = intel_attached_dp(&intel_connector->base);



	intel_dp_aux_fini(intel_dp);

	intel_connector_unregister(intel_connector);

}



static int

intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)

{
@@ -4456,6 +4446,13 @@ intel_dp_set_property(struct drm_connector *connector, 
	return 0;

}



static void

intel_dp_connector_unregister(struct drm_connector *connector)

{

	drm_dp_aux_unregister(&intel_attached_dp(connector)->aux);

	intel_connector_unregister(connector);

}



static void

intel_dp_connector_destroy(struct drm_connector *connector)

{
@@ -4466,6 +4463,8 @@ intel_dp_connector_destroy(struct drm_connector *connector) 
	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	intel_dp_aux_fini(intel_attached_dp(connector));



	/* Can't call is_edp() since the encoder may have been destroyed

	 * already. */

	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
@@ -4572,6 +4571,7 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { 
	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = intel_dp_set_property,

	.atomic_get_property = intel_connector_atomic_get_property,

	.early_unregister = intel_dp_connector_unregister,

	.destroy = intel_dp_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -5487,7 +5487,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;

	else

		intel_connector->get_hw_state = intel_connector_get_hw_state;

	intel_connector->unregister = intel_dp_connector_unregister;



	/* Set up the hotplug pin. */

	switch (port) {

drivers/gpu/drm/i915/intel_dp_mst.c

+2 −2
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { 
	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = intel_dp_mst_set_property,

	.atomic_get_property = intel_connector_atomic_get_property,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_dp_mst_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
@@ -455,7 +456,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 
	drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs, DRM_MODE_CONNECTOR_DisplayPort);

	drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs);



	intel_connector->unregister = intel_connector_unregister;

	intel_connector->get_hw_state = intel_dp_mst_get_hw_state;

	intel_connector->mst_port = intel_dp;

	intel_connector->port = port;
@@ -489,7 +489,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct drm_device *dev = connector->dev;



	intel_connector->unregister(intel_connector);

	drm_connector_unregister(connector);



	/* need to nuke the connector */

	drm_modeset_lock_all(dev);