1 files changed, 84 insertions, 3 deletions

diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 7f55829b..3887df00 100644
--- a/linux-core/intel_sdvo.c
+++ b/linux-core/intel_sdvo.c
@@ -53,6 +53,7 @@ struct intel_sdvo_priv {
 	struct intel_sdvo_dtd save_input_dtd_1, save_input_dtd_2;
 	struct intel_sdvo_dtd save_output_dtd[16];
 	u32 save_SDVOX;
+	int hotplug_enabled;
 };
 
 /**
@@ -60,7 +61,7 @@ struct intel_sdvo_priv {
  * SDVOB and SDVOC to work around apparent hardware issues (according to
  * comments in the BIOS).
  */
-static void intel_sdvo_write_sdvox(struct drm_output *output, u32 val)
+void intel_sdvo_write_sdvox(struct drm_output *output, u32 val)
 {
 	struct drm_device *dev = output->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -69,10 +70,17 @@ static void intel_sdvo_write_sdvox(struct drm_output *output, u32 val)
 	u32 bval = val, cval = val;
 	int i;
 
-	if (sdvo_priv->output_device == SDVOB)
+	if (sdvo_priv->output_device == SDVOB) {
 		cval = I915_READ(SDVOC);
-	else
+
+		if (sdvo_priv->hotplug_enabled)
+			bval = bval | (1 << 26);
+	} else {
 		bval = I915_READ(SDVOB);
+
+		if (sdvo_priv->hotplug_enabled)
+			cval = cval | (1 << 26);
+	}
 	/*
 	 * Write the registers twice for luck. Sometimes,
 	 * writing them only once doesn't appear to 'stick'.
@@ -879,6 +887,78 @@ void intel_sdvo_dump(void)
 
 }
 
+struct drm_output* intel_sdvo_find(struct drm_device *dev, int sdvoB)
+{
+	struct drm_output *output = 0;
+	struct intel_output *iout = 0;
+	struct intel_sdvo_priv *sdvo;
+
+	/* find the sdvo output */
+	list_for_each_entry(output, &dev->mode_config.output_list, head) {
+		iout = output->driver_private;
+
+		if (iout->type != INTEL_OUTPUT_SDVO)
+			continue;
+
+		sdvo = iout->dev_priv;
+
+		if (sdvo->output_device == SDVOB && sdvoB)
+			return output;
+
+		if (sdvo->output_device == SDVOC && !sdvoB)
+			return output;
+
+    }
+
+	return 0;
+}
+
+int intel_sdvo_supports_hotplug(struct drm_output *output)
+{
+	u8 response[2];
+	u8 status;
+	DRM_DEBUG("\n");
+
+	if (!output)
+		return 0;
+
+	intel_sdvo_write_cmd(output, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0);
+	status = intel_sdvo_read_response(output, &response, 2);
+
+	if (response[0] !=0)
+		return 1;
+
+	return 0;
+}
+
+void intel_sdvo_set_hotplug(struct drm_output *output, int on)
+{
+	struct intel_output *intel_output = output->driver_private;
+	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+	u8 response[2];
+	u8 status;
+
+	intel_sdvo_write_cmd(output, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);
+	intel_sdvo_read_response(output, &response, 2);
+
+	if (on) {
+		sdvo_priv->hotplug_enabled = 1;
+
+		intel_sdvo_write_cmd(output, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0);
+		status = intel_sdvo_read_response(output, &response, 2);
+
+		intel_sdvo_write_cmd(output, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2);
+	} else {
+		sdvo_priv->hotplug_enabled = 0;
+
+		response[0] = 0;
+		response[1] = 0;
+		intel_sdvo_write_cmd(output, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &response, 2);
+	}
+
+	intel_sdvo_write_cmd(output, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);
+	intel_sdvo_read_response(output, &response, 2);
+}
 
 static enum drm_output_status intel_sdvo_detect(struct drm_output *output)
 {
@@ -994,6 +1074,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device)
 	}
 
 	sdvo_priv->output_device = output_device;
+	sdvo_priv->hotplug_enabled = 0;
 	intel_output->i2c_bus = i2cbus;
 	intel_output->dev_priv = sdvo_priv;