#include <drm/drm_sysfs.h>
 #include <drm/drm_utils.h>
 
-#include <linux/fb.h>
+#include <linux/property.h>
 #include <linux/uaccess.h>
 
+#include <video/cmdline.h>
+
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
 
 static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
 {
        struct drm_cmdline_mode *mode = &connector->cmdline_mode;
-       char *option = NULL;
+       const char *option;
 
-       if (fb_get_options(connector->name, &option))
+       option = video_get_options(connector->name);
+       if (!option)
                return;
 
        if (!drm_mode_parse_command_line_for_connector(option,