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

A set of cleanups and fixes for Mikulas for using udl on arm boards.

Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAPM=9twQNgrmfe0=Okq1NTgWHRQXy+AzeDy8A0p_-y856p4vtA@mail.gmail.com

diff --combined drivers/gpu/drm/udl/udl_drv.h
index 072582570a4fa4508a18585fa95c6514f08d64a1,7588a9eb0ee0319558b07be8f6b118e77766aee6..e9e9b1ff678ee0a81d0d4b100b816b19122c7f0c
--- 1/drivers/gpu/drm/udl/udl_drv.h
--- 2/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@@ -16,7 -16,6 +16,7 @@@
  
  #include <linux/usb.h>
  #include <drm/drm_gem.h>
 +#include <linux/mm_types.h>
  
  #define DRIVER_NAME           "udl"
  #define DRIVER_DESC           "DisplayLink"
@@@ -113,7 -112,7 +113,7 @@@ udl_fb_user_fb_create(struct drm_devic
                      struct drm_file *file,
                      const struct drm_mode_fb_cmd2 *mode_cmd);
  
- int udl_render_hline(struct drm_device *dev, int bpp, struct urb **urb_ptr,
+ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
                     const char *front, char **urb_buf_ptr,
                     u32 byte_offset, u32 device_byte_offset, u32 byte_width,
                     int *ident_ptr, int *sent_ptr);
@@@ -137,7 -136,7 +137,7 @@@ void udl_gem_put_pages(struct udl_gem_o
  int udl_gem_vmap(struct udl_gem_object *obj);
  void udl_gem_vunmap(struct udl_gem_object *obj);
  int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 -int udl_gem_fault(struct vm_fault *vmf);
 +vm_fault_t udl_gem_fault(struct vm_fault *vmf);
  
  int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
                      int width, int height);