Attachment 92136 Details for Bug 70523 – fix i915 i2c cleanup order

[patch] fix i915 i2c cleanup order

0002-drm-i915-fix-dp-sdvo-i2c-cleanup.patch (text/plain), 4.61 KB, created by Imre Deak on 2014-01-15 11:45:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2014-01-15 11:45:37 UTC

Size: 4.61 KB

patch

obsolete

>From 537a8b9bc110d5cf2921a6fd9ea6c5a51df0b7e6 Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Tue, 14 Jan 2014 23:36:51 +0200
>Subject: [PATCH 2/2] drm/i915: fix dp/sdvo i2c cleanup
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c |  8 ++++++++
> drivers/gpu/drm/i915/intel_dp.c      | 10 +++++++++-
> drivers/gpu/drm/i915/intel_drv.h     |  1 +
> drivers/gpu/drm/i915/intel_sdvo.c    | 10 +++++++++-
> 4 files changed, 27 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index dde98020..53a7d30 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -11422,6 +11422,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;
>+	struct drm_encoder *encoder;
> 
> 	/*
> 	 * Interrupts and polling as the first thing to avoid creating havoc.
>@@ -11459,6 +11460,13 @@ void intel_modeset_cleanup(struct drm_device *dev)
> 	/* flush any delayed tasks or pending work */
> 	flush_scheduled_work();
> 
>+	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
>+		struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
>+
>+		if (intel_encoder->early_destroy)
>+			intel_encoder->early_destroy(intel_encoder);
>+	}
>+
> 	/* destroy the backlight and sysfs files before encoders/connectors */
> 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> 		intel_panel_destroy_backlight(connector);
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 0c62035..c8f9972 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -3266,7 +3266,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
> 	struct intel_dp *intel_dp = &intel_dig_port->dp;
> 	struct drm_device *dev = intel_dp_to_dev(intel_dp);
> 
>-	i2c_del_adapter(&intel_dp->adapter);
> 	drm_encoder_cleanup(encoder);
> 	if (is_edp(intel_dp)) {
> 		cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
>@@ -3277,6 +3276,14 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
> 	kfree(intel_dig_port);
> }
> 
>+
>+void intel_dp_encoder_early_destroy(struct intel_encoder *intel_encoder)
>+{
>+	struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
>+
>+	i2c_del_adapter(&intel_dp->adapter);
>+}
>+
> static const struct drm_connector_funcs intel_dp_connector_funcs = {
> 	.dpms = intel_connector_dpms,
> 	.detect = intel_dp_detect,
>@@ -3768,6 +3775,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
> 		intel_encoder->pre_enable = g4x_pre_enable_dp;
> 		intel_encoder->enable = g4x_enable_dp;
> 	}
>+	intel_encoder->early_destroy = intel_dp_encoder_early_destroy;
> 
> 	intel_dig_port->port = port;
> 	intel_dig_port->dp.output_reg = output_reg;
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 9841f78..63d6a25 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -149,6 +149,7 @@ struct intel_encoder {
> 	 * be set correctly before calling this function. */
> 	void (*get_config)(struct intel_encoder *,
> 			   struct intel_crtc_config *pipe_config);
>+	void (*early_destroy)(struct intel_encoder *);
> 	int crtc_mask;
> 	enum hpd_pin hpd_pin;
> };
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index 95bdfb3..58375cd 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -2238,7 +2238,6 @@ static void intel_sdvo_enc_destroy(struct drm_encoder *encoder)
> 		drm_mode_destroy(encoder->dev,
> 				 intel_sdvo->sdvo_lvds_fixed_mode);
> 
>-	i2c_del_adapter(&intel_sdvo->ddc);
> 	intel_encoder_destroy(encoder);
> }
> 
>@@ -2912,6 +2911,14 @@ intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo,
> 	return i2c_add_adapter(&sdvo->ddc) == 0;
> }
> 
>+static void intel_sdvo_early_destroy(struct intel_encoder *intel_encoder)
>+{
>+	struct intel_sdvo *intel_sdvo;
>+
>+	intel_sdvo = container_of(intel_encoder, struct intel_sdvo, base);
>+	i2c_del_adapter(&intel_sdvo->ddc);
>+}
>+
> bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>@@ -2951,6 +2958,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
> 	intel_encoder->enable = intel_enable_sdvo;
> 	intel_encoder->get_hw_state = intel_sdvo_get_hw_state;
> 	intel_encoder->get_config = intel_sdvo_get_config;
>+	intel_encoder->early_destroy = intel_sdvo_early_destroy;
> 
> 	/* In default case sdvo lvds is false */
> 	if (!intel_sdvo_get_capabilities(intel_sdvo, &intel_sdvo->caps))
>-- 
>1.8.4
>

Actions: View | Splinter Review

Attachments on bug 70523: 87716 | 92135 | 92136 | 107602

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.