[openchrome-devel] drm-openchrome: Branch 'drm-next-5.8' - 2 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_drv.c |   11 +++++++----
 drivers/gpu/drm/openchrome/openchrome_drv.h |    4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit f2307958cad529f6e1e2a3c271f9e85d272ece21
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Aug 3 18:53:41 2020 -0700

    drm/openchrome: Version bumped to 3.1.29
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 4f021ce3af1f..f9587beb52ed 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -61,10 +61,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	28
+#define DRIVER_PATCHLEVEL	29
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20200518"
+#define DRIVER_DATE		"20200803"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 10eed74047a890beeeb1adf68e1fd64387d5927a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Aug 3 18:12:31 2020 -0700

    drm/openchrome: Write return parameters only after a dumb buffer is created
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 7335b3f62924..ad566eaa910f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -69,7 +69,8 @@ static int openchrome_drm_driver_dumb_create(
 {
 	struct openchrome_drm_private *dev_private = dev->dev_private;
 	struct openchrome_bo *bo;
-	u32 handle;
+	uint32_t handle, pitch;
+	uint64_t size;
 	int ret;
 
 	DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -77,12 +78,12 @@ static int openchrome_drm_driver_dumb_create(
 	/*
 	 * Calculate the parameters for the dumb buffer.
 	 */
-	args->pitch = args->width * ((args->bpp + 7) >> 3);
-	args->size = args->pitch * args->height;
+	pitch = args->width * ((args->bpp + 7) >> 3);
+	size = pitch * args->height;
 
 	ret = openchrome_bo_create(dev,
 					&dev_private->bdev,
-					args->size,
+					size,
 					ttm_bo_type_device,
 					TTM_PL_FLAG_VRAM,
 					false,
@@ -98,6 +99,8 @@ static int openchrome_drm_driver_dumb_create(
 	}
 
 	args->handle = handle;
+	args->pitch = pitch;
+	args->size = size;
 exit:
 	DRM_DEBUG_KMS("Exiting %s.\n", __func__);
 	return ret;