Wed Jul 24 02:55:11 2013 UTC ()
Ifdef out Linux framebuffer commandline parsing in drm_modes.c.


(riastradh)
diff -r1.1.1.1.2.3 -r1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/drm/drm_modes.c

cvs diff -r1.1.1.1.2.3 -r1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/drm/drm_modes.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/drm_modes.c 2013/07/24 02:54:53 1.1.1.1.2.3
+++ src/sys/external/bsd/drm2/dist/drm/drm_modes.c 2013/07/24 02:55:11 1.1.1.1.2.4
@@ -982,26 +982,28 @@ void drm_mode_connector_list_update(stru @@ -982,26 +982,28 @@ void drm_mode_connector_list_update(stru
982 list_del(&pmode->head); 982 list_del(&pmode->head);
983 drm_mode_destroy(connector->dev, pmode); 983 drm_mode_destroy(connector->dev, pmode);
984 break; 984 break;
985 } 985 }
986 } 986 }
987 987
988 if (!found_it) { 988 if (!found_it) {
989 list_move_tail(&pmode->head, &connector->modes); 989 list_move_tail(&pmode->head, &connector->modes);
990 } 990 }
991 } 991 }
992} 992}
993EXPORT_SYMBOL(drm_mode_connector_list_update); 993EXPORT_SYMBOL(drm_mode_connector_list_update);
994 994
 995#ifndef __NetBSD__
 996
995/** 997/**
996 * drm_mode_parse_command_line_for_connector - parse command line for connector 998 * drm_mode_parse_command_line_for_connector - parse command line for connector
997 * @mode_option - per connector mode option 999 * @mode_option - per connector mode option
998 * @connector - connector to parse line for 1000 * @connector - connector to parse line for
999 * 1001 *
1000 * This parses the connector specific then generic command lines for 1002 * This parses the connector specific then generic command lines for
1001 * modes and options to configure the connector. 1003 * modes and options to configure the connector.
1002 * 1004 *
1003 * This uses the same parameters as the fb modedb.c, except for extra 1005 * This uses the same parameters as the fb modedb.c, except for extra
1004 * <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd] 1006 * <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
1005 * 1007 *
1006 * enable/enable Digital/disable bit at the end 1008 * enable/enable Digital/disable bit at the end
1007 */ 1009 */
@@ -1170,13 +1172,15 @@ drm_mode_create_from_cmdline_mode(struct @@ -1170,13 +1172,15 @@ drm_mode_create_from_cmdline_mode(struct
1170 else 1172 else
1171 mode = drm_gtf_mode(dev, 1173 mode = drm_gtf_mode(dev,
1172 cmd->xres, cmd->yres, 1174 cmd->xres, cmd->yres,
1173 cmd->refresh_specified ? cmd->refresh : 60, 1175 cmd->refresh_specified ? cmd->refresh : 60,
1174 cmd->interlace, 1176 cmd->interlace,
1175 cmd->margins); 1177 cmd->margins);
1176 if (!mode) 1178 if (!mode)
1177 return NULL; 1179 return NULL;
1178 1180
1179 drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); 1181 drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
1180 return mode; 1182 return mode;
1181} 1183}
1182EXPORT_SYMBOL(drm_mode_create_from_cmdline_mode); 1184EXPORT_SYMBOL(drm_mode_create_from_cmdline_mode);
 1185
 1186#endif