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

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_object.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit b1b38e8e7372d9d45eb77c7c54942c7231ed111b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Aug 13 10:18:26 2019 -0700

    drm/openchrome: Create a GEM handle before a TTM BO is initialized
    
    This fixes several system crash scenarios related to memory release.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c b/drivers/gpu/drm/openchrome/openchrome_object.c
index 089218d0206e..c536180b635b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_object.c
+++ b/drivers/gpu/drm/openchrome/openchrome_object.c
@@ -117,7 +117,19 @@ int openchrome_bo_create(struct drm_device *dev,
 		goto exit;
 	}
 
+	/*
+	 * It is imperative to page align the requested buffer size
+	 * prior to a memory allocation request, or various memory
+	 * allocation related system instabilities may occur.
+	 */
 	size = ALIGN(size, PAGE_SIZE);
+
+	ret = drm_gem_object_init(dev, &bo->gem, size);
+	if (ret) {
+		DRM_ERROR("Cannot initialize a GEM object.\n");
+		goto error;
+	}
+
 	openchrome_ttm_domain_to_placement(bo, ttm_domain);
 	acc_size = ttm_bo_dma_acc_size(&dev_private->bdev, size,
 					sizeof(struct openchrome_bo));
@@ -131,14 +143,7 @@ int openchrome_bo_create(struct drm_device *dev,
 				openchrome_bo_destroy);
 	if (ret) {
 		DRM_ERROR("Cannot initialize a TTM object.\n");
-		goto error;
-	}
-
-	ret = drm_gem_object_init(dev, &bo->gem, size);
-	if (ret) {
-		ttm_bo_put(&bo->ttm_bo);
-		DRM_ERROR("Cannot initialize a GEM object.\n");
-		goto error;
+		goto exit;
 	}
 
 	*bo_ptr = bo;