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

Kevin Brace kevinbrace at kemper.freedesktop.org
Sat Aug 19 02:28:26 UTC 2017


 drivers/gpu/drm/openchrome/ttm_gem.c       |    5 ++-
 drivers/gpu/drm/openchrome/via_drv.h       |   16 +++++++----
 drivers/gpu/drm/openchrome/via_h1_cmdbuf.c |    7 ++---
 drivers/gpu/drm/openchrome/via_ttm.c       |   40 ++++++++++++++---------------
 4 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit a14b8dbca6bb71dfbfcf02d372867a1d1476433d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 18 19:26:50 2017 -0700

    Adjust via_bo_create input parameter list
    
    Renaming and changing the order to make it similar to ttm_bo_init.
    
    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 316faf8f4b2d..deab55dcdd45 100644
--- a/drivers/gpu/drm/openchrome/ttm_gem.c
+++ b/drivers/gpu/drm/openchrome/ttm_gem.c
@@ -95,8 +95,9 @@ ttm_gem_create(struct drm_device *dev,
 	size = round_up(size, byte_align);
 	size = ALIGN(size, page_align);
 
-	ret = via_bo_create(bdev, size, origin, domains, byte_align,
-			      page_align, interruptible, NULL, NULL, &bo);
+	ret = via_bo_create(bdev, &bo, size, origin, domains,
+				byte_align, page_align,
+				interruptible, NULL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to create buffer object\n");
 		return ERR_PTR(ret);
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index 49a0f7190d00..210ca1eda835 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -257,12 +257,16 @@ void via_mm_fini(struct drm_device *dev);
 extern void ttm_placement_from_domain(struct ttm_buffer_object *bo,
                       struct ttm_placement *placement,
                       u32 domains, struct ttm_bo_device *bdev);
-extern int via_bo_create(struct ttm_bo_device *bdev, unsigned long size,
-               enum ttm_bo_type origin, uint32_t domains,
-               uint32_t byte_align, uint32_t page_align,
-               bool interruptible, struct sg_table *sg,
-               struct reservation_object *resv,
-               struct ttm_buffer_object **p_bo);
+extern int via_bo_create(struct ttm_bo_device *bdev,
+				struct ttm_buffer_object **p_bo,
+				unsigned long size,
+				enum ttm_bo_type type,
+				uint32_t domains,
+				uint32_t byte_alignment,
+				uint32_t page_alignment,
+				bool interruptible,
+				struct sg_table *sg,
+				struct reservation_object *resv);
 extern int via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
 extern int via_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
 extern int via_ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
diff --git a/drivers/gpu/drm/openchrome/via_h1_cmdbuf.c b/drivers/gpu/drm/openchrome/via_h1_cmdbuf.c
index fbd211b1c55f..0713785b3968 100644
--- a/drivers/gpu/drm/openchrome/via_h1_cmdbuf.c
+++ b/drivers/gpu/drm/openchrome/via_h1_cmdbuf.c
@@ -159,9 +159,10 @@ static int via_initialize(struct drm_device *dev,
 		return ret;
 	}
 
-	ret = via_bo_create(&dev_priv->bdev, init->size, ttm_bo_type_kernel,
-				TTM_PL_FLAG_TT, VIA_MM_ALIGN_SIZE, PAGE_SIZE,
-				false, NULL, NULL, &bo);
+	ret = via_bo_create(&dev_priv->bdev, &bo, init->size,
+				ttm_bo_type_kernel, TTM_PL_FLAG_TT,
+				VIA_MM_ALIGN_SIZE, PAGE_SIZE,
+				false, NULL, NULL);
 	if (!ret) {
 		ret = via_bo_pin(bo, &dev_priv->dmabuf);
 		if (ret)
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index c1860464e7df..12714409a4dc 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -615,8 +615,8 @@ int via_mm_init(struct via_device *dev_priv)
         goto exit;
     }
 
-    ret = via_bo_create(&dev_priv->bdev, VIA_MMIO_REGSIZE, ttm_bo_type_kernel,
-                        TTM_PL_FLAG_PRIV, 1, PAGE_SIZE, false, NULL, NULL, &bo);
+    ret = via_bo_create(&dev_priv->bdev, &bo, VIA_MMIO_REGSIZE, ttm_bo_type_kernel,
+                        TTM_PL_FLAG_PRIV, 1, PAGE_SIZE, false, NULL, NULL);
     if (ret) {
         DRM_ERROR("Failed to create a buffer object for MMIO: %d\n", ret);
         goto exit;
@@ -688,17 +688,16 @@ ttm_placement_from_domain(struct ttm_buffer_object *bo, struct ttm_placement *pl
     placement->placement = heap->placements;
 }
 
-int
-via_bo_create(struct ttm_bo_device *bdev,
-        unsigned long size,
-        enum ttm_bo_type origin,
-        uint32_t domains,
-        uint32_t byte_align,
-        uint32_t page_align,
-        bool interruptible,
-        struct sg_table *sg,
-        struct reservation_object *resv,
-        struct ttm_buffer_object **p_bo)
+int via_bo_create(struct ttm_bo_device *bdev,
+			struct ttm_buffer_object **p_bo,
+			unsigned long size,
+			enum ttm_bo_type type,
+			uint32_t domains,
+			uint32_t byte_alignment,
+			uint32_t page_alignment,
+			bool interruptible,
+			struct sg_table *sg,
+			struct reservation_object *resv)
 {
     struct ttm_buffer_object *bo = NULL;
     struct ttm_placement placement;
@@ -708,8 +707,8 @@ via_bo_create(struct ttm_bo_device *bdev,
 
     DRM_DEBUG("Entered via_bo_create.\n");
 
-    size = round_up(size, byte_align);
-    size = ALIGN(size, page_align);
+    size = round_up(size, byte_alignment);
+    size = ALIGN(size, page_alignment);
 
     heap = kzalloc(sizeof(struct ttm_heap), GFP_KERNEL);
     if (unlikely(!heap)) {
@@ -724,8 +723,8 @@ via_bo_create(struct ttm_bo_device *bdev,
     acc_size = ttm_bo_dma_acc_size(bdev, size,
                                     sizeof(struct ttm_heap));
 
-    ret = ttm_bo_init(bdev, bo, size, origin, &placement,
-              page_align >> PAGE_SHIFT,
+    ret = ttm_bo_init(bdev, bo, size, type, &placement,
+              page_alignment >> PAGE_SHIFT,
               interruptible, NULL, acc_size,
               sg, NULL, via_ttm_bo_destroy);
 
@@ -791,9 +790,10 @@ via_ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
                 uint32_t alignment, uint32_t domain,
                 struct ttm_bo_kmap_obj *kmap)
 {
-    int ret = via_bo_create(bdev, size, ttm_bo_type_kernel, domain,
-                  alignment, PAGE_SIZE, false, NULL,
-                  NULL, &kmap->bo);
+    int ret = via_bo_create(bdev, &kmap->bo, size,
+                            ttm_bo_type_kernel, domain,
+                            alignment, PAGE_SIZE,
+                            false, NULL, NULL);
     if (likely(!ret)) {
         ret = via_bo_pin(kmap->bo, kmap);
         if (unlikely(ret)) {


More information about the Openchrome-devel mailing list