From: Dave Airlie <airlied@redhat.com>
Date: Mon, 25 Aug 2014 23:05:14 +0000 (+1000)
Subject: Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v5.15~17039^2~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=484048db6b4890bc433aac7f5e32fdcf1b2b4786;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

radeon userptr support.

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: allow userptr write access under certain conditions
  drm/radeon: add userptr flag to register MMU notifier v3
  drm/radeon: add userptr flag to directly validate the BO to GTT
  drm/radeon: add userptr flag to limit it to anonymous memory v2
  drm/radeon: add userptr support v8

Conflicts:
	drivers/gpu/drm/radeon/radeon_prime.c
---

484048db6b4890bc433aac7f5e32fdcf1b2b4786
diff --cc drivers/gpu/drm/radeon/radeon_prime.c
index 0b16f2c,bb18bc7..d5414d4
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@@ -104,10 -104,12 +104,20 @@@ void radeon_gem_prime_unpin(struct drm_
  	radeon_bo_unreserve(bo);
  }
  
 +
 +struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *obj)
 +{
 +	struct radeon_bo *bo = gem_to_radeon_bo(obj);
 +
 +	return bo->tbo.resv;
 +}
++
+ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
+ 					struct drm_gem_object *gobj,
+ 					int flags)
+ {
+ 	struct radeon_bo *bo = gem_to_radeon_bo(gobj);
+ 	if (radeon_ttm_tt_has_userptr(bo->tbo.ttm))
+ 		return ERR_PTR(-EPERM);
+ 	return drm_gem_prime_export(dev, gobj, flags);
+ }