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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/radeon/radeon_kms.c
index 2aecd6dc26109653741bc3671ea4b82136106954,37b1deacb5b1674871e1842adf64a10fc430f0c6..261ffb5cd67032d59f62e579b731ed85aeff3e7c
--- 1/drivers/gpu/drm/radeon/radeon_kms.c
--- 2/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@@ -535,12 -559,14 +559,18 @@@ int radeon_driver_open_kms(struct drm_d
                        return -ENOMEM;
                }
  
-               radeon_vm_init(rdev, &fpriv->vm);
+               r = radeon_vm_init(rdev, &fpriv->vm);
+               if (r)
+                       return r;
+ 
+               r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
+               if (r)
+                       return r;
  
 +              r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
 +              if (r)
 +                      return r;
 +
                /* map the ib pool buffer read only into
                 * virtual address space */
                bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,

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