From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Mar 2014 09:12:31 +0000 (+1000)
Subject: Merge tag 'v3.14-rc7' into drm-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bcc298bc924e0a990f853ba3e19f8b5a833cba7e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Linux 3.14-rc7

Backmerge to help out Intel guys.
---

bcc298bc924e0a990f853ba3e19f8b5a833cba7e
diff --cc drivers/gpu/drm/radeon/radeon_kms.c
index 37b1deacb5b1,66ed3ea71440..6f1dfac17507
--- a/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,