Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915/lvds: Remove 0xa0 DDC probe for LVDS drm/i915/crt: Remove 0xa0 probe for VGA
This commit is contained in:
commit
623dda65b6
|
@ -269,21 +269,6 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static bool intel_crt_ddc_probe(struct drm_i915_private *dev_priv, int ddc_bus)
|
||||
{
|
||||
u8 buf;
|
||||
struct i2c_msg msgs[] = {
|
||||
{
|
||||
.addr = 0xA0,
|
||||
.flags = 0,
|
||||
.len = 1,
|
||||
.buf = &buf,
|
||||
},
|
||||
};
|
||||
/* DDC monitor detect: Does it ACK a write to 0xA0? */
|
||||
return i2c_transfer(&dev_priv->gmbus[ddc_bus].adapter, msgs, 1) == 1;
|
||||
}
|
||||
|
||||
static bool intel_crt_detect_ddc(struct drm_connector *connector)
|
||||
{
|
||||
struct intel_crt *crt = intel_attached_crt(connector);
|
||||
|
@ -293,11 +278,6 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
|
|||
if (crt->base.type != INTEL_OUTPUT_ANALOG)
|
||||
return false;
|
||||
|
||||
if (intel_crt_ddc_probe(dev_priv, dev_priv->crt_ddc_pin)) {
|
||||
DRM_DEBUG_KMS("CRT detected via DDC:0xa0\n");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) {
|
||||
struct edid *edid;
|
||||
bool is_digital = false;
|
||||
|
|
|
@ -829,25 +829,6 @@ static bool lvds_is_present_in_vbt(struct drm_device *dev,
|
|||
return false;
|
||||
}
|
||||
|
||||
static bool intel_lvds_ddc_probe(struct drm_device *dev, u8 pin)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
u8 buf = 0;
|
||||
struct i2c_msg msgs[] = {
|
||||
{
|
||||
.addr = 0xA0,
|
||||
.flags = 0,
|
||||
.len = 1,
|
||||
.buf = &buf,
|
||||
},
|
||||
};
|
||||
struct i2c_adapter *i2c = &dev_priv->gmbus[pin].adapter;
|
||||
/* XXX this only appears to work when using GMBUS */
|
||||
if (intel_gmbus_is_forced_bit(i2c))
|
||||
return true;
|
||||
return i2c_transfer(i2c, msgs, 1) == 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* intel_lvds_init - setup LVDS connectors on this device
|
||||
* @dev: drm device
|
||||
|
@ -888,11 +869,6 @@ bool intel_lvds_init(struct drm_device *dev)
|
|||
}
|
||||
}
|
||||
|
||||
if (!intel_lvds_ddc_probe(dev, pin)) {
|
||||
DRM_DEBUG_KMS("LVDS did not respond to DDC probe\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
intel_lvds = kzalloc(sizeof(struct intel_lvds), GFP_KERNEL);
|
||||
if (!intel_lvds) {
|
||||
return false;
|
||||
|
|
Loading…
Reference in a new issue