Merge tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel into drm-next

So small drm stuff all over for 3.18. Biggest one is the cmdline parsing
from Chris with a few fixes from me to make it work for stupid kernel
configs.

Plus the atomic prep series.

Tested for more than a week in -nightly and Ville/Imre indeed discovered
some fun which is now fixed (and i915 vblank patches postponed since the
fixups need this branch plus drm-intel-next merged together).

* tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel:
  drm: Use the type of the array element when reallocating
  drm: Don't return 0 for a value used as a denominator
  drm: Docbook fixes
  drm/irq: Implement a generic vblank_wait function
  drm: Add a plane->reset hook
  drm: trylock modest locking for fbdev panics
  drm: Move ->old_fb from crtc to plane
  drm: Handle legacy per-crtc locking with full acquire ctx
  drm: Move modeset_lock_all helpers to drm_modeset_lock.[hc]
  drm: Add drm_plane/connector_index
  drm: idiot-proof vblank
  drm: Warn when leaking flip events on close
  drm: Perform cmdline mode parsing during connector initialisation
  video/fbdev: Always built-in video= cmdline parsing
  drm: Don't grab an fb reference for the idr

5 files changed, 115 insertions, 95 deletions

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e911b9c96e19..ccbe2ae22ac5 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig FB
         tristate "Support for frame buffer devices"
+        select FB_CMDLINE
         ---help---
           The frame buffer device provides an abstraction for the graphics
           hardware. It represents the frame buffer of some video hardware and
@@ -52,6 +53,9 @@ config FIRMWARE_EDID
          combination with certain motherboards and monitors are known to
          suffer from this problem.
 
+config FB_CMDLINE
+        bool
+
 config FB_DDC
        tristate
        depends on FB
diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile
index fa306538dac2..67f28e20a892 100644
--- a/drivers/video/fbdev/core/Makefile
+++ b/drivers/video/fbdev/core/Makefile
@@ -1,4 +1,5 @@
 obj-y                             += fb_notify.o
+obj-$(CONFIG_FB_CMDLINE)          += fb_cmdline.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                      modedb.o fbcvt.o
diff --git a/drivers/video/fbdev/core/fb_cmdline.c b/drivers/video/fbdev/core/fb_cmdline.c
new file mode 100644
index 000000000000..39509ccd92f1
--- /dev/null
+++ b/drivers/video/fbdev/core/fb_cmdline.c
@@ -0,0 +1,110 @@
+/*
+ *  linux/drivers/video/fb_cmdline.c
+ *
+ *  Copyright (C) 2014 Intel Corp
+ *  Copyright (C) 1994 Martin Schaller
+ *
+ *      2001 - Documented with DocBook
+ *      - Brad Douglas <brad@neruo.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ *
+ * Authors:
+ *    Vetter <danie.vetter@ffwll.ch>
+ */
+#include <linux/init.h>
+#include <linux/fb.h>
+
+static char *video_options[FB_MAX] __read_mostly;
+static int ofonly __read_mostly;
+
+const char *fb_mode_option;
+EXPORT_SYMBOL_GPL(fb_mode_option);
+
+/**
+ * fb_get_options - get kernel boot parameters
+ * @name:   framebuffer name as it would appear in
+ *          the boot parameter line
+ *          (video=<name>:<options>)
+ * @option: the option will be stored here
+ *
+ * NOTE: Needed to maintain backwards compatibility
+ */
+int fb_get_options(const char *name, char **option)
+{
+        char *opt, *options = NULL;
+        int retval = 0;
+        int name_len = strlen(name), i;
+
+        if (name_len && ofonly && strncmp(name, "offb", 4))
+                retval = 1;
+
+        if (name_len && !retval) {
+                for (i = 0; i < FB_MAX; i++) {
+                        if (video_options[i] == NULL)
+                                continue;
+                        if (!video_options[i][0])
+                                continue;
+                        opt = video_options[i];
+                        if (!strncmp(name, opt, name_len) &&
+                            opt[name_len] == ':')
+                                options = opt + name_len + 1;
+                }
+        }
+        /* No match, pass global option */
+        if (!options && option && fb_mode_option)
+                options = kstrdup(fb_mode_option, GFP_KERNEL);
+        if (options && !strncmp(options, "off", 3))
+                retval = 1;
+
+        if (option)
+                *option = options;
+
+        return retval;
+}
+EXPORT_SYMBOL(fb_get_options);
+
+/**
+ *      video_setup - process command line options
+ *      @options: string of options
+ *
+ *      Process command line options for frame buffer subsystem.
+ *
+ *      NOTE: This function is a __setup and __init function.
+ *            It only stores the options.  Drivers have to call
+ *            fb_get_options() as necessary.
+ *
+ *      Returns zero.
+ *
+ */
+static int __init video_setup(char *options)
+{
+        int i, global = 0;
+
+        if (!options || !*options)
+                global = 1;
+
+        if (!global && !strncmp(options, "ofonly", 6)) {
+                ofonly = 1;
+                global = 1;
+        }
+
+        if (!global && !strchr(options, ':')) {
+                fb_mode_option = options;
+                global = 1;
+        }
+
+        if (!global) {
+                for (i = 0; i < FB_MAX; i++) {
+                        if (video_options[i] == NULL) {
+                                video_options[i] = options;
+                                break;
+                        }
+                }
+        }
+
+        return 1;
+}
+__setup("video=", video_setup);
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index b5e85f6c1c26..0705d8883ede 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1908,96 +1908,4 @@ int fb_new_modelist(struct fb_info *info)
         return err;
 }
 
-static char *video_options[FB_MAX] __read_mostly;
-static int ofonly __read_mostly;
-
-/**
- * fb_get_options - get kernel boot parameters
- * @name:   framebuffer name as it would appear in
- *          the boot parameter line
- *          (video=<name>:<options>)
- * @option: the option will be stored here
- *
- * NOTE: Needed to maintain backwards compatibility
- */
-int fb_get_options(const char *name, char **option)
-{
-        char *opt, *options = NULL;
-        int retval = 0;
-        int name_len = strlen(name), i;
-
-        if (name_len && ofonly && strncmp(name, "offb", 4))
-                retval = 1;
-
-        if (name_len && !retval) {
-                for (i = 0; i < FB_MAX; i++) {
-                        if (video_options[i] == NULL)
-                                continue;
-                        if (!video_options[i][0])
-                                continue;
-                        opt = video_options[i];
-                        if (!strncmp(name, opt, name_len) &&
-                            opt[name_len] == ':')
-                                options = opt + name_len + 1;
-                }
-        }
-        /* No match, pass global option */
-        if (!options && option && fb_mode_option)
-                options = kstrdup(fb_mode_option, GFP_KERNEL);
-        if (options && !strncmp(options, "off", 3))
-                retval = 1;
-
-        if (option)
-                *option = options;
-
-        return retval;
-}
-EXPORT_SYMBOL(fb_get_options);
-
-#ifndef MODULE
-/**
- *      video_setup - process command line options
- *      @options: string of options
- *
- *      Process command line options for frame buffer subsystem.
- *
- *      NOTE: This function is a __setup and __init function.
- *            It only stores the options.  Drivers have to call
- *            fb_get_options() as necessary.
- *
- *      Returns zero.
- *
- */
-static int __init video_setup(char *options)
-{
-        int i, global = 0;
-
-        if (!options || !*options)
-                global = 1;
-
-        if (!global && !strncmp(options, "ofonly", 6)) {
-                ofonly = 1;
-                global = 1;
-        }
-
-        if (!global && !strchr(options, ':')) {
-                fb_mode_option = options;
-                global = 1;
-        }
-
-        if (!global) {
-                for (i = 0; i < FB_MAX; i++) {
-                        if (video_options[i] == NULL) {
-                                video_options[i] = options;
-                                break;
-                        }
-
-                }
-        }
-
-        return 1;
-}
-__setup("video=", video_setup);
-#endif
-
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
index a9a907c440d7..388f7971494b 100644
--- a/drivers/video/fbdev/core/modedb.c
+++ b/drivers/video/fbdev/core/modedb.c
@@ -29,9 +29,6 @@
 #define DPRINTK(fmt, args...)
 #endif
 
-const char *fb_mode_option;
-EXPORT_SYMBOL_GPL(fb_mode_option);
-
 /*
  *  Standard video mode definitions (taken from XFree86)
  */