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

1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 45f04dea0ac2..83485ab81ce8 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1483,11 +1483,7 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
 {
         struct drm_device *dev = connector->dev;
         struct mga_device *mdev = (struct mga_device*)dev->dev_private;
-        struct mga_fbdev *mfbdev = mdev->mfbdev;
-        struct drm_fb_helper *fb_helper = &mfbdev->helper;
-        struct drm_fb_helper_connector *fb_helper_conn = NULL;
         int bpp = 32;
-        int i = 0;
 
         if (IS_G200_SE(mdev)) {
                 if (mdev->unique_rev_id == 0x01) {
@@ -1537,21 +1533,14 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
         }
 
         /* Validate the mode input by the user */
-        for (i = 0; i < fb_helper->connector_count; i++) {
-                if (fb_helper->connector_info[i]->connector == connector) {
-                        /* Found the helper for this connector */
-                        fb_helper_conn = fb_helper->connector_info[i];
-                        if (fb_helper_conn->cmdline_mode.specified) {
-                                if (fb_helper_conn->cmdline_mode.bpp_specified) {
-                                        bpp = fb_helper_conn->cmdline_mode.bpp;
-                                }
-                        }
-                }
+        if (connector->cmdline_mode.specified) {
+                if (connector->cmdline_mode.bpp_specified)
+                        bpp = connector->cmdline_mode.bpp;
         }
 
         if ((mode->hdisplay * mode->vdisplay * (bpp/8)) > mdev->mc.vram_size) {
-                if (fb_helper_conn)
-                        fb_helper_conn->cmdline_mode.specified = false;
+                if (connector->cmdline_mode.specified)
+                        connector->cmdline_mode.specified = false;
                 return MODE_BAD;
         }