[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/ttm_gem.c |   13 +++++++++----
 drivers/gpu/drm/openchrome/via_drv.h |   15 +++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 1259ecb387fcdb3587bccfe72f27bad527d1ecad
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 18 17:20:19 2017 -0700

    Rename ttm_gem_create function’s type input parameter to domains
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/ttm_gem.c b/drivers/gpu/drm/openchrome/ttm_gem.c
index b6a995b7af2e..316faf8f4b2d 100644
--- a/drivers/gpu/drm/openchrome/ttm_gem.c
+++ b/drivers/gpu/drm/openchrome/ttm_gem.c
@@ -79,9 +79,14 @@ int ttm_mmap(struct file *filp, struct vm_area_struct *vma)
 }
 
 struct drm_gem_object *
-ttm_gem_create(struct drm_device *dev, struct ttm_bo_device *bdev,
-	       enum ttm_bo_type origin, int types, bool interruptible,
-	       int byte_align, int page_align, unsigned long size)
+ttm_gem_create(struct drm_device *dev,
+		struct ttm_bo_device *bdev,
+		enum ttm_bo_type origin,
+		uint32_t domains,
+		bool interruptible,
+		int byte_align,
+		int page_align,
+		unsigned long size)
 {
 	struct ttm_buffer_object *bo = NULL;
 	struct ttm_gem_object *obj;
@@ -90,7 +95,7 @@ ttm_gem_create(struct drm_device *dev, struct ttm_bo_device *bdev,
 	size = round_up(size, byte_align);
 	size = ALIGN(size, page_align);
 
-	ret = via_bo_create(bdev, size, origin, types, byte_align,
+	ret = via_bo_create(bdev, size, origin, domains, byte_align,
 			      page_align, interruptible, NULL, NULL, &bo);
 	if (ret) {
 		DRM_ERROR("Failed to create buffer object\n");
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index e9473e667a26..49a0f7190d00 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -274,12 +274,15 @@ extern int ttm_mmap(struct file *filp, struct vm_area_struct *vma);
 
 extern int ttm_gem_open_object(struct drm_gem_object *obj, struct drm_file *file_priv);
 extern void ttm_gem_free_object(struct drm_gem_object *obj);
-extern struct drm_gem_object *ttm_gem_create(struct drm_device *dev,
-                         struct ttm_bo_device *bdev,
-                         enum ttm_bo_type origin,
-                         int type, bool interruptible,
-                         int byte_align, int page_align,
-                         unsigned long size);
+extern struct drm_gem_object *
+ttm_gem_create(struct drm_device *dev,
+		struct ttm_bo_device *bdev,
+		enum ttm_bo_type origin,
+		uint32_t domains,
+		bool interruptible,
+		int byte_align,
+		int page_align,
+		unsigned long size);
 extern struct ttm_buffer_object *ttm_gem_mapping(struct drm_gem_object *obj);
 
 extern struct ttm_tt *