Wed Jul 24 02:57:23 2013 UTC ()

Ifdef out Linux i2c stuff in drm_edid.c, to be rewritten.


(riastradh)

diff -r1.1.1.1.2.4 -r1.1.1.1.2.5 src/sys/external/bsd/drm2/dist/drm/drm_edid.c

--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:57:08	1.1.1.1.2.4
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:57:23	1.1.1.1.2.5

 @@ -247,26 +247,28 @@ bool drm_edid_is_valid(struct edid *edid
 	u8 *raw = (u8 *)edid;
 	if (!edid)
 		return false;
 	for (i = 0; i <= edid->extensions; i++)
 		if (!drm_edid_block_valid(raw + i * EDID_LENGTH, i, true))
 			return false;
 	return true;
+}
 EXPORT_SYMBOL(drm_edid_is_valid);
 #ifndef __NetBSD__		/* XXX i2c */
 #define DDC_SEGMENT_ADDR 0x30
 /**
  * Get EDID information via I2C.
+ *
  * \param adapter : i2c device adaptor
  * \param buf     : EDID data buffer to be filled
  * \param len     : EDID data buffer length
  * \return 0 on success or -1 on failure.
+ *
  * Try to fetch EDID information by calling i2c driver function.
  */
 static int
 drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf,
 @@ -427,26 +429,28 @@ EXPORT_SYMBOL(drm_probe_ddc);
  */
 struct edid *drm_get_edid(struct drm_connector *connector,
 			  struct i2c_adapter *adapter)
+{
 	struct edid *edid = NULL;
 	if (drm_probe_ddc(adapter))
 		edid = (struct edid *)drm_do_get_edid(connector, adapter);
 	return edid;
+}
 EXPORT_SYMBOL(drm_get_edid);
 #endif	/* !defined(__NetBSD__) */
 /*** EDID parsing ***/
 /**
  * edid_vendor - match a string against EDID's obfuscated vendor field
  * @edid: EDID to match
  * @vendor: vendor string
+ *
  * Returns true if @vendor is in @edid, false otherwise
  */
 static bool edid_vendor(struct edid *edid, char *vendor)
+{
 	char edid_vendor[3];