diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 8342259f316..d03fc05b39c 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
| @@ -269,21 +269,6 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) | |||
| 269 | return ret; | 269 | return ret; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static bool intel_crt_ddc_probe(struct drm_i915_private *dev_priv, int ddc_bus) | ||
| 273 | { | ||
| 274 | u8 buf; | ||
| 275 | struct i2c_msg msgs[] = { | ||
| 276 | { | ||
| 277 | .addr = 0xA0, | ||
| 278 | .flags = 0, | ||
| 279 | .len = 1, | ||
| 280 | .buf = &buf, | ||
| 281 | }, | ||
| 282 | }; | ||
| 283 | /* DDC monitor detect: Does it ACK a write to 0xA0? */ | ||
| 284 | return i2c_transfer(&dev_priv->gmbus[ddc_bus].adapter, msgs, 1) == 1; | ||
| 285 | } | ||
| 286 | |||
| 287 | static bool intel_crt_detect_ddc(struct drm_connector *connector) | 272 | static bool intel_crt_detect_ddc(struct drm_connector *connector) |
| 288 | { | 273 | { |
| 289 | struct intel_crt *crt = intel_attached_crt(connector); | 274 | struct intel_crt *crt = intel_attached_crt(connector); |
| @@ -293,11 +278,6 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector) | |||
| 293 | if (crt->base.type != INTEL_OUTPUT_ANALOG) | 278 | if (crt->base.type != INTEL_OUTPUT_ANALOG) |
| 294 | return false; | 279 | return false; |
| 295 | 280 | ||
| 296 | if (intel_crt_ddc_probe(dev_priv, dev_priv->crt_ddc_pin)) { | ||
| 297 | DRM_DEBUG_KMS("CRT detected via DDC:0xa0\n"); | ||
| 298 | return true; | ||
| 299 | } | ||
| 300 | |||
| 301 | if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) { | 281 | if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) { |
| 302 | struct edid *edid; | 282 | struct edid *edid; |
| 303 | bool is_digital = false; | 283 | bool is_digital = false; |
