|
@@ -499,6 +499,7 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
|
|
struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
|
|
struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
|
|
struct edid *edid;
|
|
struct edid *edid;
|
|
struct i2c_adapter *i2c;
|
|
struct i2c_adapter *i2c;
|
|
|
|
+ bool ret = false;
|
|
|
|
|
|
BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
|
|
BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
|
|
|
|
|
|
@@ -515,17 +516,17 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
|
|
*/
|
|
*/
|
|
if (!is_digital) {
|
|
if (!is_digital) {
|
|
DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
|
|
DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
|
|
- return true;
|
|
|
|
|
|
+ ret = true;
|
|
|
|
+ } else {
|
|
|
|
+ DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
|
|
}
|
|
}
|
|
-
|
|
|
|
- DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
|
|
|
|
} else {
|
|
} else {
|
|
DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n");
|
|
DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n");
|
|
}
|
|
}
|
|
|
|
|
|
kfree(edid);
|
|
kfree(edid);
|
|
|
|
|
|
- return false;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
static enum drm_connector_status
|
|
static enum drm_connector_status
|