Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is a combo of -next and some -fixes that came in in the
  intervening time.

  Highlights:

  New drivers:
    ARM Armada driver for Marvell Armada 510 SOCs

  Intel:
    Broadwell initial support under a default off switch,
    Stereo/3D HDMI mode support
    Valleyview improvements
    Displayport improvements
    Haswell fixes
    initial mipi dsi panel support
    CRC support for debugging
    build with CONFIG_FB=n

  Radeon:
    enable DPM on a number of GPUs by default
    secondary GPU powerdown support
    enable HDMI audio by default
    Hawaii support

  Nouveau:
    dynamic pm code infrastructure reworked, does nothing major yet
    GK208 modesetting support
    MSI fixes, on by default again
    PMPEG improvements
    pageflipping fixes

  GMA500:
    minnowboard SDVO support

  VMware:
    misc fixes

  MSM:
    prime, plane and rendernodes support

  Tegra:
    rearchitected to put the drm driver into the drm subsystem.
    HDMI and gr2d support for tegra 114 SoC

  QXL:
    oops fix, and multi-head fixes

  DRM core:
    sysfs lifetime fixes
    client capability ioctl
    further cleanups to device midlayer
    more vblank timestamp fixes"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
  drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
  drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
  drm/nouveau/pwr: fix missing mutex unlock in a failure path
  drm/nv40/therm: fix slowing down fan when pstate undefined
  drm/nv11-: synchronise flips to vblank, unless async flip requested
  drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
  drm/nv10-: we no longer need to create nvsw object on user channels
  drm/nouveau: always queue flips relative to kernel channel activity
  drm/nouveau: there is no need to reserve/fence the new fb when flipping
  drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
  drm/nouveau: allow nouveau_fence_ref() to be a noop
  drm/nvc8/mc: msi rearm is via the nvc0 method
  drm/ttm: Fix vma page_prot bit manipulation
  drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
  drm/vmwgfx: Resource evict fixes
  drm/edid: compare actual vrefresh for all modes for quirks
  drm: shmob_drm: Convert to clk_prepare/unprepare
  drm/nouveau: fix 32-bit build
  drm/i915/opregion: fix build error on CONFIG_ACPI=n
  Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
  ...

1 files changed, 6 insertions, 51 deletions

diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index 87664723b9ce..b179b70e7853 100644
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c
@@ -7,57 +7,20 @@ int drm_get_usb_dev(struct usb_interface *interface,
                     struct drm_driver *driver)
 {
         struct drm_device *dev;
-        struct usb_device *usbdev;
         int ret;
 
         DRM_DEBUG("\n");
 
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        dev = drm_dev_alloc(driver, &interface->dev);
         if (!dev)
                 return -ENOMEM;
 
-        usbdev = interface_to_usbdev(interface);
-        dev->usbdev = usbdev;
-        dev->dev = &interface->dev;
-
-        mutex_lock(&drm_global_mutex);
-
-        ret = drm_fill_in_dev(dev, NULL, driver);
-        if (ret) {
-                printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
-                goto err_g1;
-        }
-
+        dev->usbdev = interface_to_usbdev(interface);
         usb_set_intfdata(interface, dev);
-        ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
-        if (ret)
-                goto err_g1;
-
-        if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {
-                ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);
-                if (ret)
-                        goto err_g11;
-        }
 
-        ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);
+        ret = drm_dev_register(dev, 0);
         if (ret)
-                goto err_g2;
-
-        if (dev->driver->load) {
-                ret = dev->driver->load(dev, 0);
-                if (ret)
-                        goto err_g3;
-        }
-
-        /* setup the grouping for the legacy output */
-        ret = drm_mode_group_init_legacy_group(dev,
-                                               &dev->primary->mode_group);
-        if (ret)
-                goto err_g3;
-
-        list_add_tail(&dev->driver_item, &driver->device_list);
-
-        mutex_unlock(&drm_global_mutex);
+                goto err_free;
 
         DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
                  driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -65,16 +28,8 @@ int drm_get_usb_dev(struct usb_interface *interface,
 
         return 0;
 
-err_g3:
-        drm_put_minor(&dev->primary);
-err_g2:
-        if (dev->render)
-                drm_put_minor(&dev->render);
-err_g11:
-        drm_put_minor(&dev->control);
-err_g1:
-        kfree(dev);
-        mutex_unlock(&drm_global_mutex);
+err_free:
+        drm_dev_free(dev);
         return ret;
 
 }