diff mbox series

[v3] drm/shmem: Cleanup drm_gem_shmem_create_with_handle()

Message ID	20230123154831.3191821-1-robdclark@gmail.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Steven Price <steven.price@arm.com>, Rob Clark <robdclark@chromium.org>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3] drm/shmem: Cleanup drm_gem_shmem_create_with_handle() Date: Mon, 23 Jan 2023 07:48:31 -0800 Message-Id: <20230123154831.3191821-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v3] drm/shmem: Cleanup drm_gem_shmem_create_with_handle() \| [v3] drm/shmem: Cleanup drm_gem_shmem_create_with_handle()

Commit Message

Rob Clark Jan. 23, 2023, 3:48 p.m. UTC

  From: Rob Clark <robdclark@chromium.org>

Once we create the handle, the handle owns the reference.  Currently
nothing was doing anything with the shmem ptr after the handle was
created, but let's change drm_gem_shmem_create_with_handle() to not
return the pointer, so-as to not encourage problematic use of this
function in the future.  As a bonus, it makes the code a bit cleaner.

Signed-off-by: Rob Clark <robdclark@chromium.org>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Comments

Steven Price Jan. 23, 2023, 4:11 p.m. UTC | #1

On 23/01/2023 15:48, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
> 
> Once we create the handle, the handle owns the reference.  Currently
> nothing was doing anything with the shmem ptr after the handle was
> created, but let's change drm_gem_shmem_create_with_handle() to not
> return the pointer, so-as to not encourage problematic use of this
> function in the future.  As a bonus, it makes the code a bit cleaner.
> 
> Signed-off-by: Rob Clark <robdclark@chromium.org>

Reviewed-by: Steven Price <steven.price@arm.com>

> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index f21f47737817..42c496c5f92c 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -415,7 +415,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
>  }
>  EXPORT_SYMBOL(drm_gem_shmem_vunmap);
>  
> -static struct drm_gem_shmem_object *
> +static int
>  drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>  				 struct drm_device *dev, size_t size,
>  				 uint32_t *handle)
> @@ -425,7 +425,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>  
>  	shmem = drm_gem_shmem_create(dev, size);
>  	if (IS_ERR(shmem))
> -		return shmem;
> +		return PTR_ERR(shmem);
>  
>  	/*
>  	 * Allocate an id of idr table where the obj is registered
> @@ -434,10 +434,8 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>  	ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
>  	/* drop reference from allocate - handle holds it now. */
>  	drm_gem_object_put(&shmem->base);
> -	if (ret)
> -		return ERR_PTR(ret);
>  
> -	return shmem;
> +	return ret;
>  }
>  
>  /* Update madvise status, returns true if not purged, else
> @@ -520,7 +518,6 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>  			      struct drm_mode_create_dumb *args)
>  {
>  	u32 min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
> -	struct drm_gem_shmem_object *shmem;
>  
>  	if (!args->pitch || !args->size) {
>  		args->pitch = min_pitch;
> @@ -533,9 +530,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>  			args->size = PAGE_ALIGN(args->pitch * args->height);
>  	}
>  
> -	shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
> -
> -	return PTR_ERR_OR_ZERO(shmem);
> +	return drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
>  }
>  EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create);
>

Thomas Zimmermann Feb. 1, 2023, 10:35 a.m. UTC | #2

I have cherry-picked the patch into drm-misc-next-fixes.

Am 23.01.23 um 16:48 schrieb Rob Clark:
> From: Rob Clark <robdclark@chromium.org>
> 
> Once we create the handle, the handle owns the reference.  Currently
> nothing was doing anything with the shmem ptr after the handle was
> created, but let's change drm_gem_shmem_create_with_handle() to not
> return the pointer, so-as to not encourage problematic use of this
> function in the future.  As a bonus, it makes the code a bit cleaner.
> 
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
>   drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++---------
>   1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index f21f47737817..42c496c5f92c 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -415,7 +415,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
>   }
>   EXPORT_SYMBOL(drm_gem_shmem_vunmap);
>   
> -static struct drm_gem_shmem_object *
> +static int
>   drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>   				 struct drm_device *dev, size_t size,
>   				 uint32_t *handle)
> @@ -425,7 +425,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>   
>   	shmem = drm_gem_shmem_create(dev, size);
>   	if (IS_ERR(shmem))
> -		return shmem;
> +		return PTR_ERR(shmem);
>   
>   	/*
>   	 * Allocate an id of idr table where the obj is registered
> @@ -434,10 +434,8 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
>   	ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
>   	/* drop reference from allocate - handle holds it now. */
>   	drm_gem_object_put(&shmem->base);
> -	if (ret)
> -		return ERR_PTR(ret);
>   
> -	return shmem;
> +	return ret;
>   }
>   
>   /* Update madvise status, returns true if not purged, else
> @@ -520,7 +518,6 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>   			      struct drm_mode_create_dumb *args)
>   {
>   	u32 min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
> -	struct drm_gem_shmem_object *shmem;
>   
>   	if (!args->pitch || !args->size) {
>   		args->pitch = min_pitch;
> @@ -533,9 +530,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>   			args->size = PAGE_ALIGN(args->pitch * args->height);
>   	}
>   
> -	shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
> -
> -	return PTR_ERR_OR_ZERO(shmem);
> +	return drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
>   }
>   EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create);
>   

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index f21f47737817..42c496c5f92c 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -415,7 +415,7 @@  void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
 }
 EXPORT_SYMBOL(drm_gem_shmem_vunmap);
 
-static struct drm_gem_shmem_object *
+static int
 drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
 				 struct drm_device *dev, size_t size,
 				 uint32_t *handle)
@@ -425,7 +425,7 @@  drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
 
 	shmem = drm_gem_shmem_create(dev, size);
 	if (IS_ERR(shmem))
-		return shmem;
+		return PTR_ERR(shmem);
 
 	/*
 	 * Allocate an id of idr table where the obj is registered
@@ -434,10 +434,8 @@  drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
 	ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
 	/* drop reference from allocate - handle holds it now. */
 	drm_gem_object_put(&shmem->base);
-	if (ret)
-		return ERR_PTR(ret);
 
-	return shmem;
+	return ret;
 }
 
 /* Update madvise status, returns true if not purged, else
@@ -520,7 +518,6 @@  int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
 			      struct drm_mode_create_dumb *args)
 {
 	u32 min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
-	struct drm_gem_shmem_object *shmem;
 
 	if (!args->pitch || !args->size) {
 		args->pitch = min_pitch;
@@ -533,9 +530,7 @@  int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
 			args->size = PAGE_ALIGN(args->pitch * args->height);
 	}
 
-	shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
-
-	return PTR_ERR_OR_ZERO(shmem);
+	return drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
 }
 EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create);