drm/vram-helper: Various cleanups
Subsystems (5)
Thomas Zimmermann
maintainerv2 cover drm/vram-helper: Various cleanups
A number of cleanups that I wanted to apply for some time. The first two patches simplify the public interface. The third patch adds support for struct drm_driver.gem_create_object. All tested by running fbdev, X11 and Weston on ast HW.
v2:
* make drm_gem_vram_create() still work if GEM object is not first in struct
Thomas Zimmermann (3):
drm/vram-helper: Remove interruptible flag from public interface drm/vram-helper: Remove BO device from public interface drm/vram-helper: Support struct drm_driver.gem_create_object
drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/drm_gem_vram_helper.c | 41 ++++++++++----------- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- include/drm/drm_gem_vram_helper.h | 6 +-- 6 files changed, 25 insertions(+), 33 deletions(-)
--
2.24.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 1/3 drm/vram-helper: Remove interruptible flag from public interface
The flag 'interruptible', which is passed to various functions, is always set to be false. Remove it and hard-code the value.
--- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/drm_gem_vram_helper.c | 17 ++++++----------- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- include/drm/drm_gem_vram_helper.h | 4 +--- 6 files changed, 11 insertions(+), 18 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -1145,7 +1145,7 @@ static int ast_cursor_init(struct drm_device *dev)for (i =0 ; i <ARRAY_SIZE (ast->cursor.gbo); ++i) { gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, - size,0 , false); + size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo); goto err_drm_gem_vram_put;
drivers/gpu/drm/drm_gem_vram_helper.c +6 -11
@@ -94,8 +94,7 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo,static int drm_gem_vram_init (struct drm_device *dev,struct ttm_bo_device *bdev,struct drm_gem_vram_object *gbo, -size_t size,unsigned long pg_align, -bool interruptible) +size_t size,unsigned long pg_align) {int ret;size_t acc_size;
@@ -112,7 +111,7 @@ static int drm_gem_vram_init(struct drm_device *dev,drm_gem_vram_placement (gbo,TTM_PL_FLAG_VRAM |TTM_PL_FLAG_SYSTEM ); ret =ttm_bo_init (bdev, &gbo->bo, size, ttm_bo_type_device, - &gbo->placement, pg_align, interruptible, acc_size, + &gbo->placement, pg_align, false, acc_size,NULL ,NULL , ttm_buffer_object_destroy);if (ret) goto err_drm_gem_object_release;
@@ -130,7 +129,6 @@ static int drm_gem_vram_init(struct drm_device *dev,* @bdev: the TTM BO device backing the object * @size: the buffer size in bytes * @pg_align: the buffer's alignment in multiples of the page size -* @interruptible: sleep interruptible if waiting for memory * * Returns: * A new instance of &struct drm_gem_vram_object on success, or
@@ -139,8 +137,7 @@ static int drm_gem_vram_init(struct drm_device *dev,struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev,struct ttm_bo_device *bdev,size_t size, -unsigned long pg_align, -bool interruptible) +unsigned long pg_align) {struct drm_gem_vram_object *gbo;int ret;
@@ -149,7 +146,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,if (!gbo)return ERR_PTR (-ENOMEM ); - ret =drm_gem_vram_init (dev, bdev, gbo, size, pg_align, interruptible); + ret =drm_gem_vram_init (dev, bdev, gbo, size, pg_align);if (ret <0 ) goto err_kfree;
@@ -485,7 +482,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);* @dev: the DRM device * @bdev: the TTM BO device managing the buffer object * @pg_align: the buffer's alignment in multiples of the page size -* @interruptible: sleep interruptible if waiting for memory * @args: the arguments as provided to \ &struct drm_driver.dumb_create *
@@ -502,7 +498,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, - bool interruptible, struct drm_mode_create_dumb *args) { size_t pitch, size;
@@ -517,7 +512,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,if (!size)return -EINVAL ; - gbo =drm_gem_vram_create (dev, bdev, size, pg_align, interruptible); + gbo =drm_gem_vram_create (dev, bdev, size, pg_align);if (IS_ERR (gbo))return PTR_ERR (gbo);
@@ -613,7 +608,7 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,return -EINVAL ;return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev,0 , - false, args); + args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +1 -1
@@ -58,7 +58,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 , false); + gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
drivers/gpu/drm/mgag200/mgag200_cursor.c +1 -1
@@ -209,7 +209,7 @@ int mgag200_cursor_init(struct mga_device *mdev)for (i =0 ; i < ncursors; ++i) { gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, - size,0 , false); + size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo); goto err_drm_gem_vram_put;
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -1
@@ -121,7 +121,7 @@ int mgag200_driver_dumb_create(struct drm_file *file, pg_align =PFN_UP (mdev->mc.vram_size);return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, - pg_align, false, args); + pg_align, args); }static struct drm_driver driver = {
include/drm/drm_gem_vram_helper.h +1 -3
@@ -95,8 +95,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev,struct ttm_bo_device *bdev,size_t size, -unsigned long pg_align, -bool interruptible); +unsigned long pg_align);void drm_gem_vram_put (struct drm_gem_vram_object *gbo);u64 drm_gem_vram_mmap_offset (struct drm_gem_vram_object *gbo);s64 drm_gem_vram_offset (struct drm_gem_vram_object *gbo);
@@ -112,7 +111,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, - bool interruptible, struct drm_mode_create_dumb *args);/*
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 2/3 drm/vram-helper: Remove BO device from public interface
In reply to Thomas ZimmermannTTM is an implementation detail of the VRAM helpers and therefore shouldn't be exposed to the callers. There's only one correct value for the BO device anyway, which is the one stored in the DRM device.
So remove struct ttm_bo_device from the VRAM-helper interface and use the device's VRAM manager unconditionally. The GEM initializer function fails if the VRAM manager has not been initialized.
--- drivers/gpu/drm/ast/ast_mode.c | 3 +-- drivers/gpu/drm/drm_gem_vram_helper.c | 21 +++++++++------------ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +-- include/drm/drm_gem_vram_helper.h | 2 -- 6 files changed, 13 insertions(+), 21 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -2
@@ -1144,8 +1144,7 @@ static int ast_cursor_init(struct drm_device *dev) size =roundup (AST_HWC_SIZE +AST_HWC_SIGNATURE_SIZE ,PAGE_SIZE );for (i =0 ; i <ARRAY_SIZE (ast->cursor.gbo); ++i) { - gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, - size,0 ); + gbo =drm_gem_vram_create (dev, size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo); goto err_drm_gem_vram_put;
drivers/gpu/drm/drm_gem_vram_helper.c +9 -12
@@ -92,13 +92,18 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, }static int drm_gem_vram_init (struct drm_device *dev, -struct ttm_bo_device *bdev,struct drm_gem_vram_object *gbo,size_t size,unsigned long pg_align) { +struct drm_vram_mm *vmm = dev->vram_mm; +struct ttm_bo_device *bdev;int ret;size_t acc_size; +if (WARN_ONCE (!vmm,"VRAM MM not initialized" )) +return -EINVAL ; + bdev = &vmm->bdev; + gbo->bo.base.funcs = &drm_gem_vram_object_funcs; ret =drm_gem_object_init (dev, &gbo->bo.base, size);
@@ -126,7 +131,6 @@ static int drm_gem_vram_init(struct drm_device *dev,/** * drm_gem_vram_create() - Creates a VRAM-backed GEM object * @dev: the DRM device -* @bdev: the TTM BO device backing the object * @size: the buffer size in bytes * @pg_align: the buffer's alignment in multiples of the page size *
@@ -135,7 +139,6 @@ static int drm_gem_vram_init(struct drm_device *dev,* an ERR_PTR()-encoded error code otherwise. */ struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, -struct ttm_bo_device *bdev,size_t size,unsigned long pg_align) {
@@ -146,7 +149,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,if (!gbo)return ERR_PTR (-ENOMEM ); - ret =drm_gem_vram_init (dev, bdev, gbo, size, pg_align); + ret =drm_gem_vram_init (dev, gbo, size, pg_align);if (ret <0 ) goto err_kfree;
@@ -480,7 +483,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap); Helper for implementing &struct drm_driver.dumb_create * @file: the DRM file * @dev: the DRM device - * @bdev: the TTM BO device managing the buffer object * @pg_align: the buffer's alignment in multiples of the page size * @args: the arguments as provided to \ &struct drm_driver.dumb_create
@@ -496,7 +498,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);*/ int drm_gem_vram_fill_create_dumb (struct drm_file *file,struct drm_device *dev, -struct ttm_bo_device *bdev,unsigned long pg_align,struct drm_mode_create_dumb *args) {
@@ -512,7 +513,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,if (!size)return -EINVAL ; - gbo =drm_gem_vram_create (dev, bdev, size, pg_align); + gbo =drm_gem_vram_create (dev, size, pg_align);if (IS_ERR (gbo))return PTR_ERR (gbo);
@@ -604,11 +605,7 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,struct drm_device *dev, struct drm_mode_create_dumb *args) { - if (WARN_ONCE(!dev->vram_mm, "VRAM MM not initialized")) - return -EINVAL; - -return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev,0 , - args); + return drm_gem_vram_fill_create_dumb(file, dev, 0, args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +1 -1
@@ -58,7 +58,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 ); + gbo =drm_gem_vram_create (dev, size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
drivers/gpu/drm/mgag200/mgag200_cursor.c +1 -2
@@ -208,8 +208,7 @@ int mgag200_cursor_init(struct mga_device *mdev)return -ENOMEM ;for (i =0 ; i < ncursors; ++i) { - gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, - size,0 ); + gbo =drm_gem_vram_create (dev, size,0 );if (IS_ERR (gbo)) { ret =PTR_ERR (gbo); goto err_drm_gem_vram_put;
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -2
@@ -120,8 +120,7 @@ int mgag200_driver_dumb_create(struct drm_file *file,if (mgag200_pin_bo_at_0 (mdev)) pg_align =PFN_UP (mdev->mc.vram_size); -return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, - pg_align, args); +return drm_gem_vram_fill_create_dumb (file, dev, pg_align, args); }static struct drm_driver driver = {
include/drm/drm_gem_vram_helper.h +0 -2
@@ -93,7 +93,6 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_gem( }struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, -struct ttm_bo_device *bdev,size_t size,unsigned long pg_align);void drm_gem_vram_put (struct drm_gem_vram_object *gbo);
@@ -109,7 +108,6 @@ void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo, void *vaddr);int drm_gem_vram_fill_create_dumb (struct drm_file *file,struct drm_device *dev, -struct ttm_bo_device *bdev,unsigned long pg_align,struct drm_mode_create_dumb *args);
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 3/3 drm/vram-helper: Support struct drm_driver.gem_create_object
In reply to Thomas ZimmermannDrivers that what to allocate VRAM GEM objects with additional fields can now do this by implementing struct drm_driver.gem_create_object.
v2:
* only cast to gbo within if branch; set gbo directly in else branch
--- drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_vram_helper.c +8 -1
@@ -2,6 +2,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_ttm_helper.h>
@@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,struct drm_gem_vram_object *gbo;int ret; - gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); +if (dev->driver->gem_create_object) { +struct drm_gem_object *gem = + dev->driver->gem_create_object (dev, size); + gbo =drm_gem_vram_of_gem (gem); + }else { + gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); + }if (!gbo)return ERR_PTR (-ENOMEM );
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object
Quoted 27 lines · Thomas Zimmermann
Drivers that what to allocate VRAM GEM objects with additional fields can now do this by implementing struct drm_driver.gem_create_object.
v2:
* only cast to gbo within if branch; set gbo directly in else branchSigned-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_gem_vram_helper.c +1
-0@@ -2,6 +2,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_ttm_helper.h> @@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,struct drm_gem_vram_object *gbo;int ret;
drivers/gpu/drm/drm_gem_vram_helper.c struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, · line 156
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +7
-1- gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); +if (dev->driver->gem_create_object) { +struct drm_gem_object *gem = + dev->driver->gem_create_object (dev, size); + gbo =drm_gem_vram_of_gem (gem); + }else { + gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); + }if (!gbo)
See my other mail, I'd move the check too into if/else blocks. ERR_PTR after an upcast is always a bit scary.
-Daniel
Quoted 5 lines
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0return ERR_PTR (-ENOMEM );Signature · 1 line
2.24.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object
Hi
Am 13.12.19 um 11:27 schrieb Daniel Vetter:
Quoted 29 lines · Thomas Zimmermann
Quoted 28 lines
Drivers that what to allocate VRAM GEM objects with additional fields can now do this by implementing struct drm_driver.gem_create_object.
v2:
* only cast to gbo within if branch; set gbo directly in else branchSigned-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_gem_vram_helper.c +1
-0@@ -2,6 +2,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_ttm_helper.h> @@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,struct drm_gem_vram_object *gbo;int ret;
Quoted 12 lines
drivers/gpu/drm/drm_gem_vram_helper.c struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, · line 156
Quoted 9 lines
drivers/gpu/drm/drm_gem_vram_helper.c +7
-1- gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); +if (dev->driver->gem_create_object) { +struct drm_gem_object *gem = + dev->driver->gem_create_object (dev, size); + gbo =drm_gem_vram_of_gem (gem); + }else { + gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); + }if (!gbo)See my other mail, I'd move the check too into if/else blocks.
ERR_PTRafter an upcast is always a bit scary.
What a stupid mistake. I should have seen that myself. Will be fixed in the next iteration.
Best regards
Thomas
Quoted 8 lines
-Daniel
Quoted 5 lines
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0return ERR_PTR (-ENOMEM );Signature · 1 line
2.24.0
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: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Thomas.
Quoted 5 lines · Thomas Zimmermann
A number of cleanups that I wanted to apply for some time. The first two patches simplify the public interface. The third patch adds support for struct drm_driver.gem_create_object. All tested by running fbdev, X11 and Weston on ast HW.
Quoted 8 lines
v2:
* makedrm_gem_vram_create()still work if GEM object is not first in structThomas Zimmermann (3):
drm/vram-helper: Remove interruptible flag from public interface drm/vram-helper: Remove BO device from public interface drm/vram-helper: Support struct drm_driver.gem_create_object
I have browsed the code changes - everything now looks fine. As I miss the high-level picture (which is just my lack of DRM knowledge) this is not a review. But you can add my:
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerAm 12.12.19 um 10:49 schrieb Sam Ravnborg:
Quoted 17 lines
Hi Thomas.
Quoted 5 lines · Thomas Zimmermann
A number of cleanups that I wanted to apply for some time. The first two patches simplify the public interface. The third patch adds support for struct drm_driver.gem_create_object. All tested by running fbdev, X11 and Weston on ast HW.
Quoted 8 lines
v2:
* makedrm_gem_vram_create()still work if GEM object is not first in structThomas Zimmermann (3):
drm/vram-helper: Remove interruptible flag from public interface drm/vram-helper: Remove BO device from public interface drm/vram-helper: Support struct drm_driver.gem_create_object
Quoted 4 lines
I have browsed the code changes - everything now looks fine. As I miss the high-level picture (which is just my lack of DRM knowledge) this is not a review. But you can add my:
Acked-by Sam Ravnborg <[email protected]>
Thanks, Sam.
Quoted 3 lines
Sam
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: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel