drm/vram-helper: Various cleanups
Subsystems (5)
Thomas Zimmermann
maintainerv4 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.
v4:
* rebased onto recent drm-tip
v3:
* drm_gem_vram_create(): test for allocation failure before update
v2:
* make drm_gem_vram_create() still work if GEM object is not first in struct
Thomas Zimmermann (8):
drm/hisilicon/hibmc: Switch to generic fbdev emulation drm/hisilicon/hibmc: Replace struct hibmc_framebuffer with generic
code
drm/vram: Support scanline alignment for dumb buffers drm/hisilicon/hibmc: Implement hibmc_dumb_create() with generic
helpers
drm/hisilicon/hibmc: Export VRAM MM information to debugfs 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 | 53 ++-- drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 26 -- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 240 ------------------ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 116 +-------- drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- include/drm/drm_gem_vram_helper.h | 7 +- 11 files changed, 45 insertions(+), 418 deletions(-) delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
--
2.24.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 1/8 drm/hisilicon/hibmc: Switch to generic fbdev emulation
There's nothing special about hibmc's fbdev emulation that is not provided by the generic implementation. Switch over and remove the driver's code.
--- drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 - .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 240 ------------------ 4 files changed, 3 insertions(+), 255 deletions(-) delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
drivers/gpu/drm/hisilicon/hibmc/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o +hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_ttm.o obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2 -3
@@ -17,6 +17,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_irq.h> #include <drm/drm_print.h>
@@ -247,8 +248,6 @@ static int hibmc_unload(struct drm_device *dev) {struct hibmc_drm_private *priv = dev->dev_private; -hibmc_fbdev_fini (priv); -drm_atomic_helper_shutdown (dev);if (dev->irq_enabled)
@@ -307,7 +306,7 @@ static int hibmc_load(struct drm_device *dev)/* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset (dev); - ret =hibmc_fbdev_init (priv); + ret =drm_fbdev_generic_setup (dev,16 );if (ret) {DRM_ERROR ("failed to initialize fbdev: %d\n" , ret); goto err;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -11
@@ -25,12 +25,6 @@ struct hibmc_framebuffer {struct drm_gem_object *obj; }; -struct hibmc_fbdev { -struct drm_fb_helper helper;/* must be first */ -struct hibmc_framebuffer *fb; -int size; -}; -struct hibmc_drm_private {/* hw */ void __iomem *mmio;
@@ -42,9 +36,6 @@ struct hibmc_drm_private {/* drm */ struct drm_device *dev;bool mode_config_initialized; - -/* fbdev */ -struct hibmc_fbdev *fbdev; };#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb)
@@ -56,8 +47,6 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv,int hibmc_de_init (struct hibmc_drm_private *priv);int hibmc_vdac_init (struct hibmc_drm_private *priv); -int hibmc_fbdev_init (struct hibmc_drm_private *priv); -void hibmc_fbdev_fini (struct hibmc_drm_private *priv);int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj);
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c deleted +0 -240
240 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 2/8 drm/hisilicon/hibmc: Replace struct hibmc_framebuffer with generic code
In reply to Thomas ZimmermannThe hibmc driver's struct hibmc_framebuffer stores a DRM framebuffer with an associated GEM object. This functionality is also provided by generic code. Switch hibmc over.
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 --- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 69 +------------------ 3 files changed, 3 insertions(+), 81 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +1 -3
@@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,s64 gpu_addr =0 ;unsigned int line_l;struct hibmc_drm_private *priv = plane->dev->dev_private; -struct hibmc_framebuffer *hibmc_fb;struct drm_gem_vram_object *gbo;if (!state->fb)return ; - hibmc_fb =to_hibmc_framebuffer (state->fb); - gbo =drm_gem_vram_of_gem (hibmc_fb->obj); + gbo =drm_gem_vram_of_gem (state->fb->obj[0 ]); gpu_addr =drm_gem_vram_offset (gbo);if (WARN_ON_ONCE (gpu_addr <0 ))
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -11
@@ -20,11 +20,6 @@struct drm_device ;struct drm_gem_object ; -struct hibmc_framebuffer { -struct drm_framebuffer fb; -struct drm_gem_object *obj; -}; -struct hibmc_drm_private {/* hw */ void __iomem *mmio;
@@ -38,8 +33,6 @@ struct hibmc_drm_private {bool mode_config_initialized; }; -#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb) -void hibmc_set_power_mode (struct hibmc_drm_private *priv,unsigned int power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv,
@@ -50,10 +43,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv);int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj); -struct hibmc_framebuffer * -hibmc_framebuffer_init (struct drm_device *dev, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj);int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +2 -67
82 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 3/8 drm/vram: Support scanline alignment for dumb buffers
In reply to Thomas ZimmermannAdding the pitch alignment as an argument to drm_gem_vram_fill_create_dumb() allows to align scanlines to certain offsets. A value of 0 disables scanline pitches.
v3:
* only do power-of-2 test if pitch_align given; fails otherwise
* mgag200: call drm_gem_vram_fill_create_dumb() with pitch_align
v2:
* split of patch from related hibmc changes
* test if scanline pitch is power of 2
--- drivers/gpu/drm/drm_gem_vram_helper.c | 13 ++++++++++--- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- include/drm/drm_gem_vram_helper.h | 1 + 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +10 -3
@@ -485,6 +485,7 @@ 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 +* @pitch_align: the scanline's alignment in powers of 2 * @interruptible: sleep interruptible if waiting for memory * @args: the arguments as provided to \ &struct drm_driver.dumb_create
@@ -502,6 +503,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, + unsigned long pitch_align, bool interruptible, struct drm_mode_create_dumb *args) {
@@ -510,7 +512,12 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,int ret;u32 handle; - pitch = args->width * ((args->bpp +7 ) /8 ); + pitch = args->width *DIV_ROUND_UP (args->bpp,8 ); +if (pitch_align) { +if (WARN_ON_ONCE (!is_power_of_2 (pitch_align))) +return -EINVAL ; + pitch =ALIGN (pitch, pitch_align); + } size = pitch * args->height; size =roundup (size,PAGE_SIZE );
@@ -612,8 +619,8 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,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 , - false, args); +return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, +0 ,0 , false, args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
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,0 , false, args); }static struct drm_driver driver = {
include/drm/drm_gem_vram_helper.h +1 -0
@@ -112,6 +112,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, + unsigned long pitch_align, bool interruptible, struct drm_mode_create_dumb *args);
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 4/8 drm/hisilicon/hibmc: Implement hibmc_dumb_create() with generic helpers
In reply to Thomas ZimmermannThe hibmc driver aligns scanlines to 16 bytes. By using the new pitch_align argument of drm_gem_vram_fill_create_dumb(), convert hibmc over.
v2:
* move changes to VRAM helpers into separate patch
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 4 -- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 48 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -4
@@ -18,7 +18,6 @@#include <drm/drm_framebuffer.h> struct drm_device ; -struct drm_gem_object ;struct hibmc_drm_private {/* hw */
@@ -41,9 +40,6 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv,int hibmc_de_init (struct hibmc_drm_private *priv);int hibmc_vdac_init (struct hibmc_drm_private *priv); -int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel, -struct drm_gem_object **obj); -int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc); int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +2 -46
57 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 5/8 drm/hisilicon/hibmc: Export VRAM MM information to debugfs
In reply to Thomas ZimmermannThis change makes information about VRAM consumption available on debugfs. See
/sys/kernel/debug/dri/0/vram-mm
for an overview of how VRAM is being used.
--- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -0
@@ -55,6 +55,7 @@ static struct drm_driver hibmc_driver = { .desc = "hibmc drm driver", .major = 1, .minor = 0, + .debugfs_init = drm_vram_mm_debugfs_init, .dumb_create = hibmc_dumb_create, .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .gem_prime_mmap = drm_gem_prime_mmap,
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 5/8] drm/hisilicon/hibmc: Export VRAM MM information to debugfs
Quoted 10 lines · Thomas Zimmermann
This change makes information about VRAM consumption available on debugfs. See
/sys/kernel/debug/dri/0/vram-mmfor an overview of how VRAM is being used.
Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Acked-by Sam Ravnborg <[email protected]>
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 6/8 drm/vram-helper: Remove interruptible flag from public interface
In reply to Thomas ZimmermannThe 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;
@@ -486,7 +483,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);* @bdev: the TTM BO device managing the buffer object * @pg_align: the buffer's alignment in multiples of the page size * @pitch_align: the scanline's alignment in powers of 2 -* @interruptible: sleep interruptible if waiting for memory * @args: the arguments as provided to \ &struct drm_driver.dumb_create *
@@ -504,7 +500,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct ttm_bo_device *bdev, unsigned long pg_align, unsigned long pitch_align, - bool interruptible, struct drm_mode_create_dumb *args) { size_t pitch, size;
@@ -524,7 +519,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);
@@ -620,7 +615,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 ,0 , false, args); +0 ,0 , args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +1 -1
@@ -51,7 +51,7 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args) {return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, -0 ,16 , false, args); +0 ,16 , args); }const struct drm_mode_config_funcs hibmc_mode_funcs = {
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,0 , false, args); + pg_align,0 , 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);
@@ -113,7 +112,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct ttm_bo_device *bdev, unsigned long pg_align, unsigned long pitch_align, - bool interruptible, struct drm_mode_create_dumb *args);/*
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 6/8] drm/vram-helper: Remove interruptible flag from public interface
Quoted 7 lines · Thomas Zimmermann
The flag 'interruptible', which is passed to various functions, is always set to be false. Remove it and hard-code the value.
Signed-off-by Thomas Zimmermann <[email protected]>Suggested-by Daniel Vetter <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Acked-by Sam Ravnborg <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 7/8 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 | 18 +++++++++--------- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 3 +-- 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(+), 19 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 -9
@@ -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 * @pitch_align: the scanline's alignment in powers of 2 * @args: the arguments as provided to \
@@ -497,7 +499,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,unsigned long pitch_align,struct drm_mode_create_dumb *args)
@@ -519,7 +520,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);
@@ -614,8 +615,7 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,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 ,0 , args); +return drm_gem_vram_fill_create_dumb (file, dev,0 ,0 , args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +1 -2
@@ -50,8 +50,7 @@ void hibmc_mm_fini(struct hibmc_drm_private *hibmc)int hibmc_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args) { -return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, -0 ,16 , args); +return drm_gem_vram_fill_create_dumb (file, dev,0 ,16 , args); }const struct drm_mode_config_funcs hibmc_mode_funcs = {
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,0 , args); +return drm_gem_vram_fill_create_dumb (file, dev, pg_align,0 , 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,unsigned long pitch_align,struct drm_mode_create_dumb *args);
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 7/8] drm/vram-helper: Remove BO device from public interface
Quoted 11 lines · Thomas Zimmermann
TTM 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_devicefrom 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.Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Acked-by Sam Ravnborg <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v4 8/8 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.
v3:
* separately check allocation failure in if/else branches before upcast to gbo
v2:
* only cast to gbo within if branch; set gbo directly in else branch
--- drivers/gpu/drm/drm_gem_vram_helper.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +12 -3
@@ -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,9 +146,17 @@ 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 (!gbo) -return ERR_PTR (-ENOMEM ); +if (dev->driver->gem_create_object) { +struct drm_gem_object *gem = + dev->driver->gem_create_object (dev, size); +if (!gem) +return ERR_PTR (-ENOMEM ); + gbo =drm_gem_vram_of_gem (gem); + }else { + gbo =kzalloc (sizeof (*gbo),GFP_KERNEL ); +if (!gbo) +return ERR_PTR (-ENOMEM ); + } ret =drm_gem_vram_init (dev, gbo, size, pg_align);if (ret <0 )
Signature · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 8/8] drm/vram-helper: Support struct drm_driver.gem_create_object
Quoted 10 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.
v3:
* separately check allocation failure in if/else branches before upcast to gbo
v2:
* only cast to gbo within if branch; set gbo directly in else branch
Quoted 3 lines
Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Acked-by Sam Ravnborg <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel