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

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

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/radeon/Makefile
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/radeon/radeon_prime.c
index 0b16f2cbcf170b5a9a6d23b6683eedb827b890b4,bb18bc74b7d7d0a64bd6b596030b18ce48b92d92..d5414d42e44bf743fa289557af93bc5f02702b97
--- 1/drivers/gpu/drm/radeon/radeon_prime.c
--- 2/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);
+ }

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

diff --cc include/uapi/drm/radeon_drm.h
Simple merge