Backmerge drm-fixes merge into Linus's tree into drm-next.

This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next

Just to resolve some merges to make Daniel's life easier.

Signed-off-by: DAve Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index fa0e327,25a3e24..ce0254d
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -388,9 -406,12 +406,12 @@@ static int amdgpu_cs_parser_relocs(stru
                amdgpu_cs_buckets_get_list(&buckets, &p->validated);
        }
  
 -      p->vm_bos = amdgpu_vm_get_bos(p->adev, &fpriv->vm,
 -                                    &p->validated);
 +      INIT_LIST_HEAD(&duplicates);
 +      amdgpu_vm_get_pd_bo(&fpriv->vm, &p->validated, &p->vm_pd);
  
+       if (p->uf.bo)
+               list_add(&p->uf_entry.tv.head, &p->validated);
+ 
        if (need_mmap_lock)
                down_read(&current->mm->mmap_sem);
  

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

diff --cc drivers/gpu/drm/exynos/exynos_drm_crtc.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 2def684,52caecb..b6fa44f
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@@ -294,8 -294,10 +294,8 @@@ static int vmw_ldu_crtc_set_config(stru
        return vmw_ldu_commit_list(dev_priv);
  }
  
 -static struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
 -      .save = vmw_du_crtc_save,
 -      .restore = vmw_du_crtc_restore,
 +static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
-       .cursor_set = vmw_du_crtc_cursor_set,
+       .cursor_set2 = vmw_du_crtc_cursor_set2,
        .cursor_move = vmw_du_crtc_cursor_move,
        .gamma_set = vmw_du_crtc_gamma_set,
        .destroy = vmw_ldu_crtc_destroy,

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index ecac70a,13926ff..db082be
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@@ -530,8 -530,10 +530,8 @@@ out_no_fence
        return ret;
  }
  
 -static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
 -      .save = vmw_du_crtc_save,
 -      .restore = vmw_du_crtc_restore,
 +static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
-       .cursor_set = vmw_du_crtc_cursor_set,
+       .cursor_set2 = vmw_du_crtc_cursor_set2,
        .cursor_move = vmw_du_crtc_cursor_move,
        .gamma_set = vmw_du_crtc_gamma_set,
        .destroy = vmw_sou_crtc_destroy,

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 87fc00a,f823fc3..4ef5ffd
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@@ -1040,8 -1040,10 +1040,8 @@@ out_finish
  /*
   *  Screen Target CRTC dispatch table
   */
 -static struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
 -      .save = vmw_du_crtc_save,
 -      .restore = vmw_du_crtc_restore,
 +static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
-       .cursor_set = vmw_du_crtc_cursor_set,
+       .cursor_set2 = vmw_du_crtc_cursor_set2,
        .cursor_move = vmw_du_crtc_cursor_move,
        .gamma_set = vmw_du_crtc_gamma_set,
        .destroy = vmw_stdu_crtc_destroy,