drm/shmem: Cleanup drm_gem_shmem_create_with_handle()
Subsystems (2)
PATCH v3 1/1 drm/shmem: Cleanup drm_gem_shmem_create_with_handle()
From: Rob Clark <[email protected]>
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.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +4 -9
@@ -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);
Signature · 1 line
2.38.1
Quoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
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 <[email protected]>
Quoted 57 lines
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +4
-9@@ -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
maintainerI have cherry-picked the patch into drm-misc-next-fixes.
Am 23.01.23 um 16:48 schrieb Rob Clark:
Quoted 66 lines
From: Rob Clark <[email protected]>
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 <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +4
-9@@ -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);
Signature · 6 lines
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