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

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...

6 files changed, 75 insertions, 47 deletions

diff --git a/drivers/gpu/drm/udl/Kconfig b/drivers/gpu/drm/udl/Kconfig
index f02528686cd5..613ab0622d6e 100644
--- a/drivers/gpu/drm/udl/Kconfig
+++ b/drivers/gpu/drm/udl/Kconfig
@@ -1,8 +1,9 @@
 config DRM_UDL
         tristate "DisplayLink"
         depends on DRM
+        depends on USB_SUPPORT
         depends on USB_ARCH_HAS_HCD
-        select DRM_USB
+        select USB
         select FB_SYS_FILLRECT
         select FB_SYS_COPYAREA
         select FB_SYS_IMAGEBLIT
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index e026a9e2942a..0110d95522f3 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -34,8 +34,8 @@ static u8 *udl_get_edid(struct udl_device *udl)
                 goto error;
 
         for (i = 0; i < EDID_LENGTH; i++) {
-                ret = usb_control_msg(udl->ddev->usbdev,
-                                      usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02),
+                ret = usb_control_msg(udl->udev,
+                                      usb_rcvctrlpipe(udl->udev, 0), (0x02),
                                       (0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,
                                       HZ);
                 if (ret < 1) {
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 3ddd6cd98ac1..8607e9e513db 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -7,48 +7,13 @@
  */
 
 #include <linux/module.h>
-#include <drm/drm_usb.h>
+#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "udl_drv.h"
 
-static struct drm_driver driver;
-
-/*
- * There are many DisplayLink-based graphics products, all with unique PIDs.
- * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff)
- * We also require a match on SubClass (0x00) and Protocol (0x00),
- * which is compatible with all known USB 2.0 era graphics chips and firmware,
- * but allows DisplayLink to increment those for any future incompatible chips
- */
-static struct usb_device_id id_table[] = {
-        {.idVendor = 0x17e9, .bInterfaceClass = 0xff,
-         .bInterfaceSubClass = 0x00,
-         .bInterfaceProtocol = 0x00,
-         .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
-                        USB_DEVICE_ID_MATCH_INT_CLASS |
-                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
-                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
-        {},
-};
-MODULE_DEVICE_TABLE(usb, id_table);
-
-MODULE_LICENSE("GPL");
-
-static int udl_usb_probe(struct usb_interface *interface,
-                         const struct usb_device_id *id)
+static int udl_driver_set_busid(struct drm_device *d, struct drm_master *m)
 {
-        return drm_get_usb_dev(interface, id, &driver);
-}
-
-static void udl_usb_disconnect(struct usb_interface *interface)
-{
-        struct drm_device *dev = usb_get_intfdata(interface);
-
-        drm_kms_helper_poll_disable(dev);
-        drm_connector_unplug_all(dev);
-        udl_fbdev_unplug(dev);
-        udl_drop_usb(dev);
-        drm_unplug_dev(dev);
+        return 0;
 }
 
 static const struct vm_operations_struct udl_gem_vm_ops = {
@@ -75,6 +40,7 @@ static struct drm_driver driver = {
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
         .load = udl_driver_load,
         .unload = udl_driver_unload,
+        .set_busid = udl_driver_set_busid,
 
         /* gem hooks */
         .gem_free_object = udl_gem_free_object,
@@ -96,6 +62,61 @@ static struct drm_driver driver = {
         .patchlevel = DRIVER_PATCHLEVEL,
 };
 
+static int udl_usb_probe(struct usb_interface *interface,
+                         const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(interface);
+        struct drm_device *dev;
+        int r;
+
+        dev = drm_dev_alloc(&driver, &interface->dev);
+        if (!dev)
+                return -ENOMEM;
+
+        r = drm_dev_register(dev, (unsigned long)udev);
+        if (r)
+                goto err_free;
+
+        usb_set_intfdata(interface, dev);
+        DRM_INFO("Initialized udl on minor %d\n", dev->primary->index);
+
+        return 0;
+
+err_free:
+        drm_dev_unref(dev);
+        return r;
+}
+
+static void udl_usb_disconnect(struct usb_interface *interface)
+{
+        struct drm_device *dev = usb_get_intfdata(interface);
+
+        drm_kms_helper_poll_disable(dev);
+        drm_connector_unplug_all(dev);
+        udl_fbdev_unplug(dev);
+        udl_drop_usb(dev);
+        drm_unplug_dev(dev);
+}
+
+/*
+ * There are many DisplayLink-based graphics products, all with unique PIDs.
+ * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff)
+ * We also require a match on SubClass (0x00) and Protocol (0x00),
+ * which is compatible with all known USB 2.0 era graphics chips and firmware,
+ * but allows DisplayLink to increment those for any future incompatible chips
+ */
+static struct usb_device_id id_table[] = {
+        {.idVendor = 0x17e9, .bInterfaceClass = 0xff,
+         .bInterfaceSubClass = 0x00,
+         .bInterfaceProtocol = 0x00,
+         .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+                        USB_DEVICE_ID_MATCH_INT_CLASS |
+                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
+                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
+        {},
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
 static struct usb_driver udl_driver = {
         .name = "udl",
         .probe = udl_usb_probe,
@@ -105,13 +126,14 @@ static struct usb_driver udl_driver = {
 
 static int __init udl_init(void)
 {
-        return drm_usb_init(&driver, &udl_driver);
+        return usb_register(&udl_driver);
 }
 
 static void __exit udl_exit(void)
 {
-        drm_usb_exit(&driver, &udl_driver);
+        usb_deregister(&udl_driver);
 }
 
 module_init(udl_init);
 module_exit(udl_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 1fbf7b357f16..c7490a2489a7 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -15,6 +15,7 @@
 #define UDL_DRV_H
 
 #include <linux/usb.h>
+#include <drm/drm_gem.h>
 
 #define DRIVER_NAME             "udl"
 #define DRIVER_DESC             "DisplayLink"
@@ -47,6 +48,7 @@ struct udl_fbdev;
 struct udl_device {
         struct device *dev;
         struct drm_device *ddev;
+        struct usb_device *udev;
 
         int sku_pixel_limit;
 
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index d1da339843ca..8cbcb4589bd3 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -472,7 +472,8 @@ udl_framebuffer_init(struct drm_device *dev,
 static int udlfb_create(struct drm_fb_helper *helper,
                         struct drm_fb_helper_surface_size *sizes)
 {
-        struct udl_fbdev *ufbdev = (struct udl_fbdev *)helper;
+        struct udl_fbdev *ufbdev =
+                container_of(helper, struct udl_fbdev, helper);
         struct drm_device *dev = ufbdev->helper.dev;
         struct fb_info *info;
         struct device *device = dev->dev;
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 42795674bc07..33dbfb2c4748 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -202,7 +202,7 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
                 }
                 unode->urb = urb;
 
-                buf = usb_alloc_coherent(udl->ddev->usbdev, MAX_TRANSFER, GFP_KERNEL,
+                buf = usb_alloc_coherent(udl->udev, MAX_TRANSFER, GFP_KERNEL,
                                          &urb->transfer_dma);
                 if (!buf) {
                         kfree(unode);
@@ -211,7 +211,7 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
                 }
 
                 /* urb->transfer_buffer_length set to actual before submit */
-                usb_fill_bulk_urb(urb, udl->ddev->usbdev, usb_sndbulkpipe(udl->ddev->usbdev, 1),
+                usb_fill_bulk_urb(urb, udl->udev, usb_sndbulkpipe(udl->udev, 1),
                         buf, size, udl_urb_completion, unode);
                 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
@@ -282,6 +282,7 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
 
 int udl_driver_load(struct drm_device *dev, unsigned long flags)
 {
+        struct usb_device *udev = (void*)flags;
         struct udl_device *udl;
         int ret = -ENOMEM;
 
@@ -290,10 +291,11 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
         if (!udl)
                 return -ENOMEM;
 
+        udl->udev = udev;
         udl->ddev = dev;
         dev->dev_private = udl;
 
-        if (!udl_parse_vendor_descriptor(dev, dev->usbdev)) {
+        if (!udl_parse_vendor_descriptor(dev, udl->udev)) {
                 ret = -ENODEV;
                 DRM_ERROR("firmware not recognized. Assume incompatible device\n");
                 goto err;