Rev 6660 | Rev 6937 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6660 | Rev 6935 | ||
|---|---|---|---|
| Line 443... | Line 443... | ||
| 443 | { |
443 | { |
| 444 | struct intel_crt *crt = intel_attached_crt(connector); |
444 | struct intel_crt *crt = intel_attached_crt(connector); |
| 445 | struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private; |
445 | struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private; |
| 446 | struct edid *edid; |
446 | struct edid *edid; |
| 447 | struct i2c_adapter *i2c; |
447 | struct i2c_adapter *i2c; |
| - | 448 | bool ret = false; |
|
| Line 448... | Line 449... | ||
| 448 | 449 | ||
| Line 449... | Line 450... | ||
| 449 | BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG); |
450 | BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG); |
| 450 | 451 | ||
| Line 459... | Line 460... | ||
| 459 | * link between analog and digital outputs, so we |
460 | * link between analog and digital outputs, so we |
| 460 | * have to check the EDID input spec of the attached device. |
461 | * have to check the EDID input spec of the attached device. |
| 461 | */ |
462 | */ |
| 462 | if (!is_digital) { |
463 | if (!is_digital) { |
| 463 | DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n"); |
464 | DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n"); |
| 464 | return true; |
465 | ret = true; |
| 465 | } |
466 | } else { |
| 466 | - | ||
| 467 | DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n"); |
467 | DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n"); |
| - | 468 | } |
|
| 468 | } else { |
469 | } else { |
| 469 | DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n"); |
470 | DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n"); |
| 470 | } |
471 | } |
| Line 471... | Line 472... | ||
| 471 | 472 | ||
| Line 472... | Line 473... | ||
| 472 | kfree(edid); |
473 | kfree(edid); |
| 473 | 474 | ||
| Line 474... | Line 475... | ||
| 474 | return false; |
475 | return ret; |
| 475 | } |
476 | } |
| 476 | 477 | ||