1 files changed, 34 insertions, 39 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 65b9eabd5a2f..a77881f035e7 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -23,58 +23,49 @@
  *
  * Authors: Alex Deucher
  */
-#include <drm/drmP.h>
 
-#include "radeon.h"
-#include <drm/radeon_drm.h>
+#include <linux/dma-buf.h>
 
-struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj)
-{
-	struct radeon_bo *bo = gem_to_radeon_bo(obj);
-	int npages = bo->tbo.num_pages;
-
-	return drm_prime_pages_to_sg(bo->tbo.ttm->pages, npages);
-}
-
-void *radeon_gem_prime_vmap(struct drm_gem_object *obj)
-{
-	struct radeon_bo *bo = gem_to_radeon_bo(obj);
-	int ret;
+#include <drm/drm_prime.h>
+#include <drm/radeon_drm.h>
 
-	ret = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages,
-			  &bo->dma_buf_vmap);
-	if (ret)
-		return ERR_PTR(ret);
+#include <drm/ttm/ttm_tt.h>
 
-	return bo->dma_buf_vmap.virtual;
-}
+#include "radeon.h"
+#include "radeon_prime.h"
 
-void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
+struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj)
 {
 	struct radeon_bo *bo = gem_to_radeon_bo(obj);
 
-	ttm_bo_kunmap(&bo->dma_buf_vmap);
+	return drm_prime_pages_to_sg(obj->dev, bo->tbo.ttm->pages,
+				     bo->tbo.ttm->num_pages);
 }
 
 struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,
-							size_t size,
+							struct dma_buf_attachment *attach,
 							struct sg_table *sg)
 {
+	struct dma_resv *resv = attach->dmabuf->resv;
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_bo *bo;
 	int ret;
 
-	ret = radeon_bo_create(rdev, size, PAGE_SIZE, false,
-			       RADEON_GEM_DOMAIN_GTT, sg, &bo);
+	dma_resv_lock(resv, NULL);
+	ret = radeon_bo_create(rdev, attach->dmabuf->size, PAGE_SIZE, false,
+			       RADEON_GEM_DOMAIN_GTT, 0, sg, resv, &bo);
+	dma_resv_unlock(resv);
 	if (ret)
 		return ERR_PTR(ret);
-	bo->gem_base.driver_private = bo;
+
+	bo->tbo.base.funcs = &radeon_gem_object_funcs;
 
 	mutex_lock(&rdev->gem.mutex);
 	list_add_tail(&bo->list, &rdev->gem.objects);
 	mutex_unlock(&rdev->gem.mutex);
 
-	return &bo->gem_base;
+	bo->prime_shared_count = 1;
+	return &bo->tbo.base;
 }
 
 int radeon_gem_prime_pin(struct drm_gem_object *obj)
@@ -82,25 +73,29 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)
 	struct radeon_bo *bo = gem_to_radeon_bo(obj);
 	int ret = 0;
 
-	ret = radeon_bo_reserve(bo, false);
-	if (unlikely(ret != 0))
-		return ret;
-
 	/* pin buffer into GTT */
 	ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
-	radeon_bo_unreserve(bo);
+	if (likely(ret == 0))
+		bo->prime_shared_count++;
+
 	return ret;
 }
 
 void radeon_gem_prime_unpin(struct drm_gem_object *obj)
 {
 	struct radeon_bo *bo = gem_to_radeon_bo(obj);
-	int ret = 0;
-
-	ret = radeon_bo_reserve(bo, false);
-	if (unlikely(ret != 0))
-		return;
 
 	radeon_bo_unpin(bo);
-	radeon_bo_unreserve(bo);
+	if (bo->prime_shared_count)
+		bo->prime_shared_count--;
+}
+
+
+struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
+					int flags)
+{
+	struct radeon_bo *bo = gem_to_radeon_bo(gobj);
+	if (radeon_ttm_tt_has_userptr(bo->rdev, bo->tbo.ttm))
+		return ERR_PTR(-EPERM);
+	return drm_gem_prime_export(gobj, flags);
 }