Merge tag 'v3.14-rc7' into drm-next

Linux 3.14-rc7

Backmerge to help out Intel guys.

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_hdmi.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/cik.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/radeon/r600.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_kms.c
index 37b1deacb5b1674871e1842adf64a10fc430f0c6,66ed3ea7144010e7c95bc0d07c01ad5499242947..6f1dfac1750749d4da74c45e6f5cae7fba90f6ee
--- 1/drivers/gpu/drm/radeon/radeon_kms.c
--- 2/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@@ -559,14 -543,12 +567,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_ttm.c
Simple merge

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

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