Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:13:27 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_edid.c
Log Message:
Restore ddc probing in drm_edid.c now that we have Linux i2c shims.
Also include <linux/string.h> for memchr_inv.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/sys/external/bsd/drm2/dist/drm/drm_edid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.9
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.8 Wed Jul 24 02:58:25 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Wed Jul 24 03:13:27 2013
@@ -35,6 +35,7 @@
#include <linux/export.h>
#include <linux/printk.h>
#include <linux/device.h>
+#include <linux/string.h>
#include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm_edid.h>
@@ -258,8 +259,6 @@ bool drm_edid_is_valid(struct edid *edid
}
EXPORT_SYMBOL(drm_edid_is_valid);
-#ifndef __NetBSD__ /* XXX i2c */
-
#define DDC_SEGMENT_ADDR 0x30
/**
* Get EDID information via I2C.
@@ -440,8 +439,6 @@ struct edid *drm_get_edid(struct drm_con
}
EXPORT_SYMBOL(drm_get_edid);
-#endif /* !defined(__NetBSD__) */
-
/*** EDID parsing ***/
/**
