Merge remote branch 'airlied/drm-core-next' into tmp

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

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

diff --cc drivers/gpu/drm/i915/intel_fb.c
index b937ccfa7bec9a037ae7b6fddf6d635552a4aba1,521622b9be7a7fa9ddebdd79813c5530c1d06425..af2a1dddc28e2e908529db44a24cea44ff10d387
--- 1/drivers/gpu/drm/i915/intel_fb.c
--- 2/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -225,8 -225,8 +225,8 @@@ static void intel_fbdev_destroy(struct 
  
        drm_framebuffer_cleanup(&ifb->base);
        if (ifb->obj) {
-               drm_gem_object_handle_unreference_unlocked(ifb->obj);
 -              drm_gem_object_unreference(ifb->obj);
 +              drm_gem_object_unreference_unlocked(ifb->obj);
+               ifb->obj = NULL;
        }
  }