diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-04-12 08:32:54 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-04-12 08:32:54 +0000 |
| commit | 48cc9ba65bf3d9b827a44d6366c5432f920fbbc0 (patch) | |
| tree | 5c1549e3ca3afb7d4a872decd4d7f3aa349d636b /sys/dev | |
| parent | b18c196175a47df23afdebd31e8700618f4885af (diff) | |
Now we can handle bitbanging enable the fallback method of getting
the crt edid if normal gmbus access failed.
Seems to resolve problems Christopher Zimmermann was seeing fetching
the crt edid.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_crt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/intel_crt.c b/sys/dev/pci/drm/i915/intel_crt.c index e12568c5657..886e12141ee 100644 --- a/sys/dev/pci/drm/i915/intel_crt.c +++ b/sys/dev/pci/drm/i915/intel_crt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_crt.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_crt.c,v 1.2 2013/04/12 08:32:53 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -457,14 +457,12 @@ intel_crt_get_edid(struct drm_connector *connector, edid = drm_get_edid(connector, i2c); -#ifdef notyet if (!edid && !intel_gmbus_is_forced_bit(i2c)) { DRM_DEBUG_KMS("CRT GMBUS EDID read failed, retry using GPIO bit-banging\n"); intel_gmbus_force_bit(i2c, true); edid = drm_get_edid(connector, i2c); intel_gmbus_force_bit(i2c, false); } -#endif return edid; } |