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

[Kevin Brace]

 drivers/gpu/drm/openchrome/ttm_gem.c |   12 +++++-------
 drivers/gpu/drm/openchrome/via_fb.c  |    2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 2d04112c8f19744515a1389fd8297bb0e4a7e533
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 18 20:49:25 2017 -0700

    Alter kzalloc input parameter inside via_user_framebuffer_create
    
    Might be meaningless, but I prefer it this way.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_fb.c b/drivers/gpu/drm/openchrome/via_fb.c
index 6414bd25b924..ef68cd20ecb0 100644
--- a/drivers/gpu/drm/openchrome/via_fb.c
+++ b/drivers/gpu/drm/openchrome/via_fb.c
@@ -967,7 +967,7 @@ via_user_framebuffer_create(struct drm_device *dev,
 		return ERR_PTR(-ENOENT);
 	}
 
-	via_fb = kzalloc(sizeof(*via_fb), GFP_KERNEL);
+	via_fb = kzalloc(sizeof(struct via_framebuffer), GFP_KERNEL);
 	if (!via_fb) {
 		return ERR_PTR(-ENOMEM);
 	}
commit 9398f3eb83fd66d499f9f43aa92a3d922da8a0c0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 18 20:48:20 2017 -0700

    Alter kzalloc input parameter inside ttm_gem_create
    
    Might be meaningless, but I prefer it this way.
    
    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 c0320f160b7d..d4179dd16f57 100644
--- a/drivers/gpu/drm/openchrome/ttm_gem.c
+++ b/drivers/gpu/drm/openchrome/ttm_gem.c
@@ -92,7 +92,7 @@ ttm_gem_create(struct drm_device *dev,
 	struct ttm_gem_object *obj;
 	int ret;
 
-	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
+	obj = kzalloc(sizeof(struct ttm_gem_object), GFP_KERNEL);
 	if (!obj) {
 		return ERR_PTR(-ENOMEM);
 	}
commit a83c29230f01e7f8a4cef1cbf29173bcb7233669
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 18 20:10:47 2017 -0700

    Allocate GEMified TTM object before TTM heap allocation
    
    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 971fadc1435e..c0320f160b7d 100644
--- a/drivers/gpu/drm/openchrome/ttm_gem.c
+++ b/drivers/gpu/drm/openchrome/ttm_gem.c
@@ -92,9 +92,13 @@ ttm_gem_create(struct drm_device *dev,
 	struct ttm_gem_object *obj;
 	int ret;
 
+	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
+	if (!obj) {
+		return ERR_PTR(-ENOMEM);
+	}
+
 	size = round_up(size, byte_alignment);
 	size = ALIGN(size, page_alignment);
-
 	ret = via_bo_create(bdev, &bo, size, type, domains,
 				byte_alignment, page_alignment,
 				interruptible, NULL, NULL);
@@ -103,12 +107,6 @@ ttm_gem_create(struct drm_device *dev,
 		return ERR_PTR(ret);
 	}
 
-	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
-	if (!obj) {
-		ttm_bo_unref(&bo);
-		return ERR_PTR(-ENOMEM);
-	}
-
 	ret = drm_gem_object_init(dev, &obj->gem, size);
 	if (unlikely(ret)) {
 		ttm_bo_unref(&bo);