summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/pci/drm/drmP.h3
-rw-r--r--sys/dev/pci/drm/drm_fb_helper.c4
-rw-r--r--sys/dev/pci/drm/drm_modes.c3
3 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 44c3513160b..7c5cb51dcc9 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -925,6 +925,9 @@ bool drm_handle_vblank(struct drm_device *, int);
void drm_calc_timestamping_constants(struct drm_crtc *);
int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *,
int, int *, struct timeval *, unsigned, struct drm_crtc *);
+struct drm_display_mode *
+ drm_mode_create_from_cmdline_mode(struct drm_device *,
+ struct drm_cmdline_mode *);
/* AGP/PCI Express/GART support (drm_agpsupport.c) */
struct drm_agp_head *drm_agp_init(void);
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c
index 49f84462bf6..10758d51af2 100644
--- a/sys/dev/pci/drm/drm_fb_helper.c
+++ b/sys/dev/pci/drm/drm_fb_helper.c
@@ -1061,9 +1061,6 @@ struct drm_display_mode *
drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,
int width, int height)
{
- DRM_DEBUG_KMS("stub\n");
- return (NULL);
-#ifdef notyet
struct drm_cmdline_mode *cmdline_mode;
struct drm_display_mode *mode = NULL;
@@ -1100,7 +1097,6 @@ create_mode:
cmdline_mode);
list_add(&mode->head, &fb_helper_conn->connector->modes);
return mode;
-#endif
}
bool
diff --git a/sys/dev/pci/drm/drm_modes.c b/sys/dev/pci/drm/drm_modes.c
index 50918d845cb..b4b3817d6ee 100644
--- a/sys/dev/pci/drm/drm_modes.c
+++ b/sys/dev/pci/drm/drm_modes.c
@@ -40,9 +40,6 @@ void drm_mode_validate_clocks(struct drm_device *, struct list_head *,
int *, int *, int);
bool drm_mode_parse_command_line_for_connector(const char *,
struct drm_connector *, struct drm_cmdline_mode *);
-struct drm_display_mode *
- drm_mode_create_from_cmdline_mode(struct drm_device *,
- struct drm_cmdline_mode *);
int drm_mode_compare(struct drm_display_mode *, struct drm_display_mode*);
long simple_strtol(const char *, char **, int);