---

yaml --- r: 318759 b: refs/heads/master c: 4d678e1 h: refs/heads/master i: 318757: 4cd2012 318755: 1b63cd0 318751: ee0e879 v: v3
git-mirror · Jul 20, 2012 · d8bf342 · d8bf342
1 parent e206bf1
commit d8bf342
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2bd1f541f1990dda7dd62f190342c9a964ceb4f
+refs/heads/master: 4d678e1670ad3c7240d559c98e481b43342a2974
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -342,7 +342,6 @@ struct intel_fbc_work {
 };
 
 int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
-extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus);
 
 extern void intel_attach_force_audio_property(struct drm_connector *connector);
 extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector);

diff --git a/trunk/drivers/gpu/drm/i915/intel_modes.c b/trunk/drivers/gpu/drm/i915/intel_modes.c
@@ -32,34 +32,6 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
-/**
- * intel_ddc_probe
- *
- */
-bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
-{
-	struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-	u8 out_buf[] = { 0x0, 0x0};
-	u8 buf[2];
-	struct i2c_msg msgs[] = {
-		{
-			.addr = DDC_ADDR,
-			.flags = 0,
-			.len = 1,
-			.buf = out_buf,
-		},
-		{
-			.addr = DDC_ADDR,
-			.flags = I2C_M_RD,
-			.len = 1,
-			.buf = buf,
-		}
-	};
-
-	return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
-			    msgs, 2) == 2;
-}
-
 /**
  * intel_ddc_get_modes - get modelist from monitor
  * @connector: DRM connector device to use