diff mbox

drm/i915: fix sdvo hotplug support check and activation

Message ID 1346247838-6331-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula Aug. 29, 2012, 1:43 p.m. UTC 
The sdvo hotplug support check and activation has worked by coincidence for
TMDS0. The boolean value returned by intel_sdvo_supports_hotplug() was
masked with a bit shifted by device number, which also should have been one
of SDVO_OUTPUT_* bits instead. Boolean true masked with 1 shifted by 0 just
happened to match SDVO_OUTPUT_TMDS0...

Get hotplug support as a bit mask, check the correct bits for support, and
use the correct bits for activating hotplug support.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

In reply to the other patch as this depends on it.
---
 drivers/gpu/drm/i915/intel_sdvo.c |   29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

Comments

Simon Farnsworth Aug. 29, 2012, 3:55 p.m. UTC | #1 
(apologies to Daniel and Jani, who've seen this twice - I accidentally
sent it from the wrong address originally).

On Wednesday 29 August 2012 16:43:58 Jani Nikula wrote:
> The sdvo hotplug support check and activation has worked by coincidence for
> TMDS0. The boolean value returned by intel_sdvo_supports_hotplug() was
> masked with a bit shifted by device number, which also should have been one
> of SDVO_OUTPUT_* bits instead. Boolean true masked with 1 shifted by 0 just
> happened to match SDVO_OUTPUT_TMDS0...
> 
> Get hotplug support as a bit mask, check the correct bits for support, and
> use the correct bits for activating hotplug support.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.com>

The code you're fixing was written with the aid of ajax's educated guesses - 
it's nice to see an Intel employee fix it to match the spec.
Daniel Vetter Sept. 3, 2012, 7:38 a.m. UTC | #2 
On Wed, Aug 29, 2012 at 03:12:37PM +0100, Simon Farnsworth wrote:
> On Wednesday 29 August 2012 16:43:58 Jani Nikula wrote:
> > The sdvo hotplug support check and activation has worked by coincidence for
> > TMDS0. The boolean value returned by intel_sdvo_supports_hotplug() was
> > masked with a bit shifted by device number, which also should have been one
> > of SDVO_OUTPUT_* bits instead. Boolean true masked with 1 shifted by 0 just
> > happened to match SDVO_OUTPUT_TMDS0...
> > 
> > Get hotplug support as a bit mask, check the correct bits for support, and
> > use the correct bits for activating hotplug support.
> > 
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > 
> Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.com>
Queued for -next (together with a duplicate of the bugfix to avoid merge
hassles), thanks for the patch.
-Daniel
> 
> The code you're fixing was written with the aid of ajax's educated guesses - 
> it's nice to see an Intel employee fix it to match the spec.
> -- 
> Simon Farnsworth
> Software Engineer
> ONELAN Ltd
> http://www.onelan.com
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 80552de..6b4f43f 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -97,7 +97,7 @@  struct intel_sdvo {
 	/*
 	 * Hotplug activation bits for this device
 	 */
-	uint8_t hotplug_active[2];
+	uint16_t hotplug_active;
 
 	/**
 	 * This is used to select the color range of RBG outputs in HDMI mode.
@@ -1251,25 +1251,29 @@  static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
 	return true;
 }
 
-static int intel_sdvo_supports_hotplug(struct intel_sdvo *intel_sdvo)
+static uint16_t intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo)
 {
 	struct drm_device *dev = intel_sdvo->base.base.dev;
-	u8 response[2];
+	uint16_t hotplug;
 
 	/* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise
 	 * on the line. */
 	if (IS_I945G(dev) || IS_I945GM(dev))
-		return false;
+		return 0;
+
+	if (!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
+					&hotplug, sizeof(hotplug)))
+		return 0;
 
-	return intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
-				    &response, 2) && response[0];
+	return hotplug;
 }
 
 static void intel_sdvo_enable_hotplug(struct intel_encoder *encoder)
 {
 	struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);
 
-	intel_sdvo_write_cmd(intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &intel_sdvo->hotplug_active, 2);
+	intel_sdvo_write_cmd(intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG,
+			&intel_sdvo->hotplug_active, 2);
 }
 
 static bool
@@ -2063,17 +2067,18 @@  intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
 
 	intel_connector = &intel_sdvo_connector->base;
 	connector = &intel_connector->base;
-	if (intel_sdvo_supports_hotplug(intel_sdvo) & (1 << device)) {
+	if (intel_sdvo_get_hotplug_support(intel_sdvo) &
+		intel_sdvo_connector->output_flag) {
 		connector->polled = DRM_CONNECTOR_POLL_HPD;
-		intel_sdvo->hotplug_active[0] |= 1 << device;
+		intel_sdvo->hotplug_active |= intel_sdvo_connector->output_flag;
 		/* Some SDVO devices have one-shot hotplug interrupts.
 		 * Ensure that they get re-enabled when an interrupt happens.
 		 */
 		intel_encoder->hot_plug = intel_sdvo_enable_hotplug;
 		intel_sdvo_enable_hotplug(intel_encoder);
-	}
-	else
+	} else {
 		connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
+	}
 	encoder->encoder_type = DRM_MODE_ENCODER_TMDS;
 	connector->connector_type = DRM_MODE_CONNECTOR_DVID;
 
@@ -2589,7 +2594,7 @@  bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
 	/* Only enable the hotplug irq if we need it, to work around noisy
 	 * hotplug lines.
 	 */
-	if (intel_sdvo->hotplug_active[0])
+	if (intel_sdvo->hotplug_active)
 		dev_priv->hotplug_supported_mask |= hotplug_mask;
 
 	intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg);