Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_sgdma.c

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
index a1103fc6597dde91958658d4d6faaabaec38e803,9f592703c3696842d8a858de06bec880cd832a65..22c8ab70db2c041c9d10061a5b9304b27f78be3c
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -810,9 -788,24 +810,24 @@@ static struct vm_operations_struct i915
        .close = drm_gem_vm_close,
  };
  
+ static const struct file_operations i915_driver_fops = {
+       .owner = THIS_MODULE,
+       .open = drm_open,
+       .release = drm_release,
+       .unlocked_ioctl = drm_ioctl,
+       .mmap = drm_gem_mmap,
+       .poll = drm_poll,
+       .fasync = drm_fasync,
+       .read = drm_read,
+ #ifdef CONFIG_COMPAT
+       .compat_ioctl = i915_compat_ioctl,
+ #endif
+       .llseek = noop_llseek,
+ };
+ 
  static struct drm_driver driver = {
 -      /* don't use mtrr's here, the Xserver or user space app should
 -       * deal with them for intel hardware.
 +      /* Don't use MTRRs here; the Xserver or userspace app should
 +       * deal with them for Intel hardware.
         */
        .driver_features =
            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Simple merge

diff --cc drivers/xen/swiotlb-xen.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/drm/drm_mode.h
Simple merge