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

Commit d9255d57 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: destroy connector sysfs files earlier 



For some reason, every single time I try to run module_reload
something tries to read the connector sysfs files. This happens
after we destroy the encoders and before we destroy the connectors, so
when the sysfs read triggers the connector detect() function,
intel_conector->encoder points to memory that was already freed.

The bad backtrace is just:
    [<ffffffff8163ca9a>] dump_stack+0x54/0x74
    [<ffffffffa00c2c8e>] intel_dp_detect+0x1e/0x4b0 [i915]
    [<ffffffffa001913d>] status_show+0x3d/0x80 [drm]
    [<ffffffff813d5340>] dev_attr_show+0x20/0x60
    [<ffffffff81221f50>] ? sysfs_read_file+0x80/0x1b0
    [<ffffffff81221f79>] sysfs_read_file+0xa9/0x1b0
    [<ffffffff811aaf1e>] vfs_read+0x9e/0x170
    [<ffffffff811aba4c>] SyS_read+0x4c/0xa0
    [<ffffffff8164e392>] system_call_fastpath+0x16/0x1b

But if you add tons of memory checking debug options to your Kernel
you'll also see:
 - general protection fault: 0000
 - BUG kmalloc-4096 (Tainted: G      D W   ): Poison overwritten
 - INFO: Allocated in intel_ddi_init+0x65/0x270 [i915]
 - INFO: Freed in intel_dp_encoder_destroy+0x69/0xb0 [i915]
Among a bunch of other error messages.

So this commit just destroys the sysfs files before both the encoder
and connectors are freed.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 70aff66c

drivers/gpu/drm/i915/intel_crt.c

+0 −1
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) 


static void intel_crt_destroy(struct drm_connector *connector)

{

	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);

}

drivers/gpu/drm/i915/intel_display.c

+5 −0
Original line number Diff line number Diff line
@@ -10727,6 +10727,7 @@ void intel_modeset_cleanup(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	struct drm_connector *connector;



	/*

	 * Interrupts and polling as the first thing to avoid creating havoc.
@@ -10769,6 +10770,10 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	/* destroy backlight, if any, before the connectors */

	intel_panel_destroy_backlight(dev);



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

	list_for_each_entry(connector, &dev->mode_config.connector_list, head)

		drm_sysfs_connector_remove(connector);



	drm_mode_config_cleanup(dev);



	intel_cleanup_overlay(dev);

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -3189,7 +3189,6 @@ intel_dp_connector_destroy(struct drm_connector *connector) 
	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)

		intel_panel_fini(&intel_connector->panel);



	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);

}

drivers/gpu/drm/i915/intel_dsi.c

+0 −1
Original line number Diff line number Diff line
@@ -504,7 +504,6 @@ static void intel_dsi_destroy(struct drm_connector *connector) 


	DRM_DEBUG_KMS("\n");

	intel_panel_fini(&intel_connector->panel);

	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);

}

drivers/gpu/drm/i915/intel_dvo.c

+0 −1
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ static int intel_dvo_get_modes(struct drm_connector *connector) 


static void intel_dvo_destroy(struct drm_connector *connector)

{

	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);

}