Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next

fixups for nouveau and fencing

* 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux:
  drm/nouveau: export reservation_object from dmabuf to ttm
  drm/ttm: add reservation_object as argument to ttm_bo_init
  drm: Pass dma-buf as argument to gem_prime_import_sg_table
  drm/nouveau: assign fence_chan->name correctly
  drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
  drm/nouveau: bump driver patchlevel to 1.2.1

36 files changed, 126 insertions, 63 deletions

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index c65d432f42c4..08f82eae6939 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -339,7 +339,7 @@ int ast_bo_create(struct drm_device *dev, int size, int align,
         ret = ttm_bo_init(&ast->ttm.bdev, &astbo->bo, size,
                           ttm_bo_type_device, &astbo->placement,
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-                          NULL, ast_bo_ttm_destroy);
+                          NULL, NULL, ast_bo_ttm_destroy);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 324f5a09a0a1..66286ff518d4 100644
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -377,7 +377,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align,
         ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size,
                           ttm_bo_type_device, &bochsbo->placement,
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-                          NULL, bochs_bo_ttm_destroy);
+                          NULL, NULL, bochs_bo_ttm_destroy);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index d3c615f9b183..dfffd528517a 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -343,7 +343,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align,
         ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size,
                           ttm_bo_type_device, &cirrusbo->placement,
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-                          NULL, cirrus_bo_ttm_destroy);
+                          NULL, NULL, cirrus_bo_ttm_destroy);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index e467e67af6e7..0316310e2cc4 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -316,7 +316,8 @@ out:
 EXPORT_SYMBOL_GPL(drm_gem_cma_prime_get_sg_table);
 
 struct drm_gem_object *
-drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size,
+drm_gem_cma_prime_import_sg_table(struct drm_device *dev,
+                                  struct dma_buf_attachment *attach,
                                   struct sg_table *sgt)
 {
         struct drm_gem_cma_object *cma_obj;
@@ -325,14 +326,14 @@ drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size,
                 return ERR_PTR(-EINVAL);
 
         /* Create a CMA GEM buffer. */
-        cma_obj = __drm_gem_cma_create(dev, size);
+        cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size);
         if (IS_ERR(cma_obj))
                 return ERR_CAST(cma_obj);
 
         cma_obj->paddr = sg_dma_address(sgt->sgl);
         cma_obj->sgt = sgt;
 
-        DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, size);
+        DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, attach->dmabuf->size);
 
         return &cma_obj->base;
 }
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 7826de9da276..78ca30808422 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -525,7 +525,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
                 goto fail_detach;
         }
 
-        obj = dev->driver->gem_prime_import_sg_table(dev, dma_buf->size, sgt);
+        obj = dev->driver->gem_prime_import_sg_table(dev, attach, sgt);
         if (IS_ERR(obj)) {
                 ret = PTR_ERR(obj);
                 goto fail_unmap;
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 8ac70626df6c..d16964ea0ed4 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -339,7 +339,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align,
         ret = ttm_bo_init(&mdev->ttm.bdev, &mgabo->bo, size,
                           ttm_bo_type_device, &mgabo->placement,
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-                          NULL, mgag200_bo_ttm_destroy);
+                          NULL, NULL, mgag200_bo_ttm_destroy);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index afaafd42dee7..67f9d0a2332c 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -171,7 +171,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);
 void *msm_gem_prime_vmap(struct drm_gem_object *obj);
 void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,
-                size_t size, struct sg_table *sg);
+                struct dma_buf_attachment *attach, struct sg_table *sg);
 int msm_gem_prime_pin(struct drm_gem_object *obj);
 void msm_gem_prime_unpin(struct drm_gem_object *obj);
 void *msm_gem_vaddr_locked(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c
index d48f9fc5129b..ad772fe36115 100644
--- a/drivers/gpu/drm/msm/msm_gem_prime.c
+++ b/drivers/gpu/drm/msm/msm_gem_prime.c
@@ -18,6 +18,7 @@
 #include "msm_drv.h"
 #include "msm_gem.h"
 
+#include <linux/dma-buf.h>