Wed Jul 24 02:58:25 2013 UTC ()
Fix const in drm_match_cea_mode in drm_edid.c.


(riastradh)
diff -r1.1.1.1.2.7 -r1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/drm_edid.c

cvs diff -r1.1.1.1.2.7 -r1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/drm_edid.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:58:09 1.1.1.1.2.7
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:58:25 1.1.1.1.2.8
@@ -1539,31 +1539,39 @@ u8 *drm_find_cea_extension(struct edid * @@ -1539,31 +1539,39 @@ u8 *drm_find_cea_extension(struct edid *
1539 if (i == edid->extensions) 1539 if (i == edid->extensions)
1540 return NULL; 1540 return NULL;
1541 1541
1542 return edid_ext; 1542 return edid_ext;
1543} 1543}
1544EXPORT_SYMBOL(drm_find_cea_extension); 1544EXPORT_SYMBOL(drm_find_cea_extension);
1545 1545
1546/* 1546/*
1547 * Looks for a CEA mode matching given drm_display_mode. 1547 * Looks for a CEA mode matching given drm_display_mode.
1548 * Returns its CEA Video ID code, or 0 if not found. 1548 * Returns its CEA Video ID code, or 0 if not found.
1549 */ 1549 */
1550u8 drm_match_cea_mode(struct drm_display_mode *to_match) 1550u8 drm_match_cea_mode(struct drm_display_mode *to_match)
1551{ 1551{
 1552#ifdef __NetBSD__
 1553 const struct drm_display_mode *cea_mode;
 1554#else
1552 struct drm_display_mode *cea_mode; 1555 struct drm_display_mode *cea_mode;
 1556#endif
1553 u8 mode; 1557 u8 mode;
1554 1558
1555 for (mode = 0; mode < drm_num_cea_modes; mode++) { 1559 for (mode = 0; mode < drm_num_cea_modes; mode++) {
 1560#ifdef __NetBSD__
 1561 cea_mode = &edid_cea_modes[mode];
 1562#else
1556 cea_mode = (struct drm_display_mode *)&edid_cea_modes[mode]; 1563 cea_mode = (struct drm_display_mode *)&edid_cea_modes[mode];
 1564#endif
1557 1565
1558 if (drm_mode_equal(to_match, cea_mode)) 1566 if (drm_mode_equal(to_match, cea_mode))
1559 return mode + 1; 1567 return mode + 1;
1560 } 1568 }
1561 return 0; 1569 return 0;
1562} 1570}
1563EXPORT_SYMBOL(drm_match_cea_mode); 1571EXPORT_SYMBOL(drm_match_cea_mode);
1564 1572
1565 1573
1566static int 1574static int
1567do_cea_modes (struct drm_connector *connector, u8 *db, u8 len) 1575do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
1568{ 1576{
1569 struct drm_device *dev = connector->dev; 1577 struct drm_device *dev = connector->dev;