[PATCH 3/3 v2] drm/i915: hot removal notification to HDMI audiodriver

[Wu Fengguang]

On monitor hot removal:

1) clear SDVO_AUDIO_ENABLE or DP_AUDIO_OUTPUT_ENABLE
2) clear ELD Valid bit

So that the audio driver will receive hot plug events and take action to
refresh its device state and ELD contents.

cc: Wang Zhenyu <zhenyu.z.wang@xxxxxxxxx>
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
---
 drivers/gpu/drm/drm_crtc_helper.c |    4 ++++
 drivers/gpu/drm/i915/intel_dp.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_hdmi.c |   17 +++++++++++++++++
 include/drm/drm_crtc.h            |    1 +
 4 files changed, 39 insertions(+)

--- linux.orig/drivers/gpu/drm/i915/intel_dp.c	2011-11-16 21:36:58.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_dp.c	2011-11-16 21:37:00.000000000 +0800
@@ -1984,6 +1984,22 @@ intel_dp_detect(struct drm_connector *co
 	return connector_status_connected;
 }
 
+static void intel_dp_hot_remove(struct drm_connector *connector)
+{
+	struct intel_dp *intel_dp = intel_attached_dp(connector);
+	struct drm_device *dev = intel_dp->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_crtc *crtc = intel_dp->base.base.crtc;
+
+	intel_dp->DP &= ~DP_AUDIO_OUTPUT_ENABLE;
+	I915_WRITE(intel_dp->output_reg, intel_dp->DP);
+	POSTING_READ(intel_dp->output_reg);
+
+	connector->eld[0] = 0;
+	if (dev_priv->display.write_eld)
+		dev_priv->display.write_eld(connector, crtc);
+}
+
 static int intel_dp_get_modes(struct drm_connector *connector)
 {
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
@@ -2143,6 +2159,7 @@ static const struct drm_connector_funcs 
 	.detect = intel_dp_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.set_property = intel_dp_set_property,
+	.hot_remove = intel_dp_hot_remove,
 	.destroy = intel_dp_destroy,
 };
 
--- linux.orig/drivers/gpu/drm/i915/intel_hdmi.c	2011-11-16 21:36:58.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_hdmi.c	2011-11-16 21:37:00.000000000 +0800
@@ -350,6 +350,22 @@ intel_hdmi_detect(struct drm_connector *
 	return status;
 }
 
+static void intel_hdmi_hot_remove(struct drm_connector *connector)
+{
+	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
+	struct drm_i915_private *dev_priv = connector->dev->dev_private;
+	u32 temp;
+
+	temp = I915_READ(intel_hdmi->sdvox_reg);
+	I915_WRITE(intel_hdmi->sdvox_reg, temp & ~SDVO_AUDIO_ENABLE);
+	POSTING_READ(intel_hdmi->sdvox_reg);
+
+	connector->eld[0] = 0;
+	if (dev_priv->display.write_eld)
+		dev_priv->display.write_eld(connector,
+					    intel_hdmi->base.base.crtc);
+}
+
 static int intel_hdmi_get_modes(struct drm_connector *connector)
 {
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
@@ -459,6 +475,7 @@ static const struct drm_connector_funcs 
 	.detect = intel_hdmi_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.set_property = intel_hdmi_set_property,
+	.hot_remove = intel_hdmi_hot_remove,
 	.destroy = intel_hdmi_destroy,
 };
 
--- linux.orig/drivers/gpu/drm/drm_crtc_helper.c	2011-11-16 21:36:58.000000000 +0800
+++ linux/drivers/gpu/drm/drm_crtc_helper.c	2011-11-16 21:37:00.000000000 +0800
@@ -905,6 +905,10 @@ static void output_poll_execute(struct w
 			      old_status, connector->status);
 		if (old_status != connector->status)
 			changed = true;
+		if (old_status == connector_status_connected &&
+		    connector->status == connector_status_disconnected)
+			connector->funcs->hot_remove(connector);
+
 	}
 
 	mutex_unlock(&dev->mode_config.mutex);
--- linux.orig/include/drm/drm_crtc.h	2011-11-16 21:36:58.000000000 +0800
+++ linux/include/drm/drm_crtc.h	2011-11-16 21:37:00.000000000 +0800
@@ -419,6 +419,7 @@ struct drm_connector_funcs {
 	int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height);
 	int (*set_property)(struct drm_connector *connector, struct drm_property *property,
 			     uint64_t val);
+	void (*hot_remove)(struct drm_connector *connector);
 	void (*destroy)(struct drm_connector *connector);
 	void (*force)(struct drm_connector *connector);
 };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/