Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
-44
-20
drivers/gpu/drm/i915/intel_crt.c
-20
drivers/gpu/drm/i915/intel_crt.c
···
269
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
272
static bool intel_crt_detect_ddc(struct drm_connector *connector)
288
273
{
289
274
struct intel_crt *crt = intel_attached_crt(connector);
···
277
292
/* CRT should always be at 0, but check anyway */
278
293
if (crt->base.type != INTEL_OUTPUT_ANALOG)
279
294
return false;
280
-
281
-
if (intel_crt_ddc_probe(dev_priv, dev_priv->crt_ddc_pin)) {
282
-
DRM_DEBUG_KMS("CRT detected via DDC:0xa0\n");
283
-
return true;
284
-
}
285
295
286
296
if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) {
287
297
struct edid *edid;
-24
drivers/gpu/drm/i915/intel_lvds.c
-24
drivers/gpu/drm/i915/intel_lvds.c
···
829
829
return false;
830
830
}
831
831
832
-
static bool intel_lvds_ddc_probe(struct drm_device *dev, u8 pin)
833
-
{
834
-
struct drm_i915_private *dev_priv = dev->dev_private;
835
-
u8 buf = 0;
836
-
struct i2c_msg msgs[] = {
837
-
{
838
-
.addr = 0xA0,
839
-
.flags = 0,
840
-
.len = 1,
841
-
.buf = &buf,
842
-
},
843
-
};
844
-
struct i2c_adapter *i2c = &dev_priv->gmbus[pin].adapter;
845
-
/* XXX this only appears to work when using GMBUS */
846
-
if (intel_gmbus_is_forced_bit(i2c))
847
-
return true;
848
-
return i2c_transfer(i2c, msgs, 1) == 1;
849
-
}
850
-
851
832
/**
852
833
* intel_lvds_init - setup LVDS connectors on this device
853
834
* @dev: drm device
···
867
886
DRM_DEBUG_KMS("disable LVDS for eDP support\n");
868
887
return false;
869
888
}
870
-
}
871
-
872
-
if (!intel_lvds_ddc_probe(dev, pin)) {
873
-
DRM_DEBUG_KMS("LVDS did not respond to DDC probe\n");
874
-
return false;
875
889
}
876
890
877
891
intel_lvds = kzalloc(sizeof(struct intel_lvds), GFP_KERNEL);