Merge tag 'v4.10-rc8' into drm-next

Linux 4.10-rc8

Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_drv.h
Simple merge

diff --cc drivers/gpu/drm/ast/ast_main.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/i915_gem_internal.c
index 628699a91106c2f57930e19c63b1aa90b28c124e,d09c74973cb37a6c8d599c007ea4a53c0e0994e0..933019e1b206c08d5e4320822dfb85ca45bea3d5
--- 1/drivers/gpu/drm/i915/i915_gem_internal.c
--- 2/drivers/gpu/drm/i915/i915_gem_internal.c
+++ b/drivers/gpu/drm/i915/i915_gem_internal.c
@@@ -52,10 -52,30 +52,18 @@@ i915_gem_object_get_pages_internal(stru
        int max_order;
        gfp_t gfp;
  
 -      st = kmalloc(sizeof(*st), GFP_KERNEL);
 -      if (!st)
 -              return ERR_PTR(-ENOMEM);
 -
 -      if (sg_alloc_table(st, npages, GFP_KERNEL)) {
 -              kfree(st);
 -              return ERR_PTR(-ENOMEM);
 -      }
 -
 -      sg = st->sgl;
 -      st->nents = 0;
 -
        max_order = MAX_ORDER;
  #ifdef CONFIG_SWIOTLB
-       if (swiotlb_nr_tbl()) /* minimum max swiotlb size is IO_TLB_SEGSIZE */
-               max_order = min(max_order, ilog2(IO_TLB_SEGPAGES));
+       if (swiotlb_nr_tbl()) {
+               unsigned int max_segment;
+ 
+               max_segment = swiotlb_max_segment();
+               if (max_segment) {
+                       max_segment = max_t(unsigned int, max_segment,
+                                           PAGE_SIZE) >> PAGE_SHIFT;
+                       max_order = min(max_order, ilog2(max_segment));
+               }
+       }
  #endif
  
        gfp = GFP_KERNEL | __GFP_HIGHMEM | __GFP_RECLAIMABLE;

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

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.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/nouveau/nouveau_usif.c
Simple merge

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

diff --cc drivers/gpu/drm/nouveau/nv84_fence.c
index 86360fca4b1877132fe3200a8f048e426144de2e,f0b322bec7df22de23bbae372333fb484ac6d9ed..bd7a8a1e4ad9774f2e9840ecb0d6d741c430751c
--- 1/drivers/gpu/drm/nouveau/nv84_fence.c
--- 2/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@@ -212,8 -216,10 +216,10 @@@ nv84_fence_create(struct nouveau_drm *d
        priv->base.context_base = dma_fence_context_alloc(priv->base.contexts);
        priv->base.uevent = true;
  
+       mutex_init(&priv->mutex);
+ 
        /* Use VRAM if there is any ; otherwise fallback to system memory */
 -      domain = drm->device.info.ram_size != 0 ? TTM_PL_FLAG_VRAM :
 +      domain = drm->client.device.info.ram_size != 0 ? TTM_PL_FLAG_VRAM :
                         /*
                          * fences created in sysmem must be non-cached or we
                          * will lose CPU/GPU coherency!

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
index af3bbe82fd48992cfd979711925fa4e5c784054f,30bd4a6a9d466e11755bf95cee6929473ae65adf..956c425e639e7bfa66cc71a3fe486e9e5753b35f
--- 1/drivers/gpu/drm/radeon/radeon_drv.c
--- 2/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@@ -97,12 -97,13 +97,13 @@@
   *   2.46.0 - Add PFP_SYNC_ME support on evergreen
   *   2.47.0 - Add UVD_NO_OP register support
   *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
+  *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible values
   */
  #define KMS_DRIVER_MAJOR      2
- #define KMS_DRIVER_MINOR      48
+ #define KMS_DRIVER_MINOR      49
  #define KMS_DRIVER_PATCHLEVEL 0
  int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 -int radeon_driver_unload_kms(struct drm_device *dev);
 +void radeon_driver_unload_kms(struct drm_device *dev);
  void radeon_driver_lastclose_kms(struct drm_device *dev);
  int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
  void radeon_driver_postclose_kms(struct drm_device *dev,

diff --cc drivers/gpu/drm/vc4/vc4_crtc.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_plane.c
Simple merge

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

diff --cc include/drm/drm_atomic.h
index 2e28fdca9c3d293c56e4192d287e59e459ff80b4,56814e8ae7ea91a4c9aeed59a2c6f9d2263fb2e4..052ab161b239275cf8bc29891fa75ed0d9e1227e
--- 1/include/drm/drm_atomic.h
--- 2/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@@ -145,8 -144,7 +145,8 @@@ struct __drm_crtcs_state 
        struct drm_crtc *ptr;
        struct drm_crtc_state *state;
        struct drm_crtc_commit *commit;
-       s64 __user *out_fence_ptr;
+       s32 __user *out_fence_ptr;
 +      unsigned last_vblank_count;
  };
  
  struct __drm_connnectors_state {

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

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge