Share TTM code among DRM framebuffer drivers
Subsystems (8)
Thomas Zimmermann
maintainerv3 cover Share TTM code among DRM framebuffer drivers
Several simple framebuffer drivers copy most of the TTM code from each other. The implementation is always the same; except for the name of some data structures.
As recently discussed, this patch set provides generic memory-management code for simple framebuffers with dedicated video memory. It further converts the respective drivers to the generic code. The shared code is basically the same implementation as the one copied among individual drivers.
The patch set contains two major changes: first, it introduces |struct drm_gem_vram_object| and helpers (GEM VRAM). It's a GEM object that is backed by VRAM. The type's purpose is somewhat similar to |struct drm_gem_{cma, shmem}_object|: it provides an commom implementation that handles all the basic cases. Second, the patch set introduces |struct drm_vram_mm| and helpers (VRAM MM). It's an implementation of a basic memory manager for VRAM.
Both, GEM VRAM and VRAM MM, support buffer placement in VRAM and system memory. Both can be used independedly from each other if desired by the DRM driver.
Currently ast, bochs, mgag200, vboxvideo and hisilicon/hibmc can use these helpers.
Future directions: with these changes, the respective drivers can also share some of their mode-setting or fbdev code. GEM VRAM could implement PRIME helpers, which would allow for using the generic fbcon.
The patch set is against a recent drm-tip.
v3:
* share VRAM MM callback structure among drivers
* move VRAM MM instances to drm_device and share rsp. code
v2:
* rename |struct drm_gem_ttm_object| to |struct drm_gem_vram_object|
* rename |struct drm_simple_ttm| to |struct drm_vram_mm|
* make drm_is_gem_ttm() an internal helper
* add drm_gem_vram_kmap_at()
* return is_iomem from kmap functions
* redefine TTM placement flags for public interface
* add drm_vram_mm_mmap() helper
* replace almost all of driver's TTM code with these helpers
* documentation fixes
Thomas Zimmermann (19):
drm: Add |struct drm_gem_vram_object| and helpers drm: Add |struct drm_gem_vram_object| callbacks for |struct
ttm_bo_driver|
drm: Add |struct drm_gem_vram_object| callbacks for |struct
drm_driver|
drm: Add drm_gem_vram_fill_create_dumb() to create dumb buffers
drm: Add VRAM MM, a simple memory manager for dedicated VRAM
drm: Add default instance for VRAM MM callback functions
drm: Integrate VRAM MM into struct drm_device
drm/ast: Convert AST driver to |struct drm_gem_vram_object| drm/ast: Convert AST driver to VRAM MM
drm/ast: Replace mapping code with drm_gem_vram_{kmap/kunmap}() drm/bochs: Convert bochs driver to |struct drm_gem_vram_object| drm/bochs: Convert bochs driver to VRAM MM
drm/mgag200: Convert mgag200 driver to |struct drm_gem_vram_object| drm/mgag200: Convert mgag200 driver to VRAM MM drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}() drm/vboxvideo: Convert vboxvideo driver to |struct
drm_gem_vram_object|
drm/vboxvideo: Convert vboxvideo driver to VRAM MM drm/hisilicon: Convert hibmc-drm driver to |struct
drm_gem_vram_object|
drm/hisilicon: Convert hibmc-drm driver to VRAM MM
Documentation/gpu/drm-mm.rst | 25 +- drivers/gpu/drm/Kconfig | 20 + drivers/gpu/drm/Makefile | 5 + drivers/gpu/drm/ast/Kconfig | 3 +- drivers/gpu/drm/ast/ast_drv.c | 13 +- drivers/gpu/drm/ast/ast_drv.h | 71 +- drivers/gpu/drm/ast/ast_fb.c | 30 +- drivers/gpu/drm/ast/ast_main.c | 77 +-- drivers/gpu/drm/ast/ast_mode.c | 124 ++-- drivers/gpu/drm/ast/ast_ttm.c | 302 +-------- drivers/gpu/drm/bochs/Kconfig | 2 + drivers/gpu/drm/bochs/bochs.h | 47 +- drivers/gpu/drm/bochs/bochs_drv.c | 13 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 408 +----------- drivers/gpu/drm/drm_gem_vram_helper.c | 612 ++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + drivers/gpu/drm/drm_vram_mm_helper.c | 278 ++++++++ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 21 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 13 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 341 +--------- drivers/gpu/drm/mgag200/Kconfig | 2 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 88 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 74 +-- drivers/gpu/drm/mgag200/mgag200_fb.c | 30 +- drivers/gpu/drm/mgag200/mgag200_main.c | 87 +-- drivers/gpu/drm/mgag200/mgag200_mode.c | 52 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 301 +-------- drivers/gpu/drm/vboxvideo/Kconfig | 2 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 12 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 75 +-- drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +- drivers/gpu/drm/vboxvideo/vbox_main.c | 75 +-- drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 355 +--------- include/drm/drm_device.h | 4 + include/drm/drm_gem_vram_helper.h | 139 ++++ include/drm/drm_vram_mm_helper.h | 99 +++ 42 files changed, 1581 insertions(+), 2379 deletions(-) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c create mode 100644 include/drm/drm_gem_vram_helper.h create mode 100644 include/drm/drm_vram_mm_helper.h
--
2.21.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 1/19 drm: Add |struct drm_gem_vram_object| and helpers
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* move drm_is_gem_ttm() to a later patch in the series
* add drm_gem_vram_kmap_at()
* return is_iomem from kmap functions
* redefine TTM placement flags for public interface
* documentation fixes
--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.h
Documentation/gpu/drm-mm.rst +12 -0
@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================
drivers/gpu/drm/Kconfig +13 -0
@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM
@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions + config DRM_VM bool depends on DRM && MMU
drivers/gpu/drm/Makefile +4 -0
@@ -32,6 +32,10 @@ drm-$(CONFIG_AGP) += drm_agpsupport.o drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o +drm_vram_helper-y := drm_vram_helper_common.o +drm_vram_helper-$(CONFIG_DRM_GEM_VRAM_HELPER) += drm_gem_vram_helper.o +obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o + drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
drivers/gpu/drm/drm_gem_vram_helper.c new file +410 -0
410 lines not on this page · raw message
drivers/gpu/drm/drm_vram_helper_common.c new file +6 -0
@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );
include/drm/drm_gem_vram_helper.h new file +92 -0
92 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 1/19 drm: Add |struct drm_gem_vram_object| and helpers
In reply to Thomas ZimmermannThe type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* move drm_is_gem_ttm() to a later patch in the series
* add drm_gem_vram_kmap_at()
* return is_iomem from kmap functions
* redefine TTM placement flags for public interface
* documentation fixes
--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.h
Documentation/gpu/drm-mm.rst +12 -0
@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================
drivers/gpu/drm/Kconfig +13 -0
@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM
@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions + config DRM_VM bool depends on DRM && MMU
drivers/gpu/drm/Makefile +4 -0
@@ -32,6 +32,10 @@ drm-$(CONFIG_AGP) += drm_agpsupport.o drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o +drm_vram_helper-y := drm_vram_helper_common.o +drm_vram_helper-$(CONFIG_DRM_GEM_VRAM_HELPER) += drm_gem_vram_helper.o +obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o + drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
drivers/gpu/drm/drm_gem_vram_helper.c new file +410 -0
410 lines not on this page · raw message
drivers/gpu/drm/drm_vram_helper_common.c new file +6 -0
@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );
include/drm/drm_gem_vram_helper.h new file +92 -0
92 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing - unint32_t is used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?
I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 72 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 10 lines
drivers/gpu/drm/Kconfig +7
-0@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +
I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.
What can be done is something like:
symbol foo
bool
symbol bar
depends on foo
symbol foobar
bool "This is what you need - select me"
select foo
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 6 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */
It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.
VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {
include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};
Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.
include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}
Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}
ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);
Here is is "normal"
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Thomas ZimmermannHi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing - unint32_t is used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?
I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 72 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 10 lines
drivers/gpu/drm/Kconfig +7
-0@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +
I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.
What can be done is something like:
symbol foo
bool
symbol bar
depends on foo
symbol foobar
bool "This is what you need - select me"
select foo
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 6 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */
It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.
VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {
include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};
Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.
include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}
Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}
ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);
Here is is "normal"
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Hi,
thanks for the feedback.
Am 29.04.19 um 21:58 schrieb Sam Ravnborg:
Quoted 8 lines
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?
The DRM API already has a mixture of such types and I tried to use the type that best fits the current context. But yeah, I don't mind some consistency. I'll see if I can replace some of these instances.
Quoted 27 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 7 lines
drivers/gpu/drm/Kconfig +7
-0+config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select foo
Quoted 5 lines
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
It may not strictly be necessary here, but the other helpers' symbols depend on DRM. I'd like to keep it consistent unless there's a strong reason not to.
Quoted 8 lines
Quoted 8 lines
+/**
+ * DOC: overview
+ *
+ * This library provides a GEM object that is backed by VRAM. It
+ * can be used for simple framebuffer devices with dedicated memory.
+ */
Quoted 6 lines
It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
OK :)
Quoted 24 lines
Quoted 24 lines
include/drm/drm_gem_vram_helper.h new file +24
-0+/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object { +struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; +
Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 45
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.
Oh well, I should have checked this. Thanks for reporting.
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object
Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Best regards
Thomas
Quoted 23 lines
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgHi,
thanks for the feedback.
Am 29.04.19 um 21:58 schrieb Sam Ravnborg:
Quoted 8 lines
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?
The DRM API already has a mixture of such types and I tried to use the type that best fits the current context. But yeah, I don't mind some consistency. I'll see if I can replace some of these instances.
Quoted 27 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 7 lines
drivers/gpu/drm/Kconfig +7
-0+config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select foo
Quoted 5 lines
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
It may not strictly be necessary here, but the other helpers' symbols depend on DRM. I'd like to keep it consistent unless there's a strong reason not to.
Quoted 8 lines
Quoted 8 lines
+/**
+ * DOC: overview
+ *
+ * This library provides a GEM object that is backed by VRAM. It
+ * can be used for simple framebuffer devices with dedicated memory.
+ */
Quoted 6 lines
It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
OK :)
Quoted 24 lines
Quoted 24 lines
include/drm/drm_gem_vram_helper.h new file +24
-0+/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object { +struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; +
Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 45
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.
Oh well, I should have checked this. Thanks for reporting.
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object
Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Best regards
Thomas
Quoted 23 lines
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Hi Thomas.
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Thomas ZimmermannHi Thomas.
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
static inline struct drm_gem_vram_object*drm_gem_vram_of_bo(struct ttm_buffer_object *bo)
Regards,
Christian.
Quoted 7 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgAm 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
static inline struct drm_gem_vram_object*drm_gem_vram_of_bo(struct ttm_buffer_object *bo)
Regards,
Christian.
Quoted 7 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
Best regards
Thomas
Am 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 49 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 7 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Quoted 5 lines · Thomas Zimmermann
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
I think Noralf Tronnes or Gerd Hoffmann would also make good reviewers for this, fairly close to what they've been working on in the past. -Daniel
Quoted 66 lines
Best regards
ThomasAm 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 35 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object Quoted 8 lines
include/drm/drm_gem_vram_helper.h line 57
Quoted 6 lines
+ */
include/drm/drm_gem_vram_helper.h new file +5
-0+static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
Quoted 14 lines
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 7 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Am 03.05.19 um 14:01 schrieb Daniel Vetter:
Quoted 9 lines
[CAUTION: External Email]
Quoted 4 lines · Thomas Zimmermann
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
I think Noralf Tronnes or Gerd Hoffmann would also make good reviewers for this, fairly close to what they've been working on in the past.
I will try to take another look next week. Busy as usual here.
Christian.
Quoted 65 lines
-Daniel
Quoted 57 lines
Best regards
ThomasAm 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 34 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+ +/** + * Returns the container of type &struct drm_gem_vram_object + * for field bo. + * @bo: the VRAM buffer object + * Returns: The containing GEM VRAM objectQuoted 8 lines
Review
Quoted 6 lines
+ */
(quoted diff) +5
-0+static inline struct drm_gem_vram_object* drm_gem_vram_of_bo( + struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
Quoted 12 lines
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 6 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Am 03.05.19 um 14:07 schrieb Koenig, Christian:
Quoted 4 lines
Am 03.05.19 um 14:01 schrieb Daniel Vetter:
Quoted 3 lines
[CAUTION: External Email]
On Fri, May 3, 2019 at 12:15 PM Thomas Zimmermann <[email protected]> wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
I think Noralf Tronnes or Gerd Hoffmann would also make good reviewers for this, fairly close to what they've been working on in the past.
I will try to take another look next week. Busy as usual here.
Thanks, I'll post v4 of the patches early next week.
Quoted 72 lines
Christian.
Quoted 69 lines
-Daniel
Quoted 57 lines
Best regards
ThomasAm 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 34 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+ +/** + * Returns the container of type &struct drm_gem_vram_object + * for field bo. + * @bo: the VRAM buffer object + * Returns: The containing GEM VRAM objectQuoted 8 lines
Review
Quoted 6 lines
+ */
(quoted diff) +5
-0+static inline struct drm_gem_vram_object* drm_gem_vram_of_bo( + struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
Quoted 12 lines
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 6 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Koenig, ChristianAm 03.05.19 um 14:07 schrieb Koenig, Christian:
Quoted 4 lines
Am 03.05.19 um 14:01 schrieb Daniel Vetter:
Quoted 3 lines
[CAUTION: External Email]
On Fri, May 3, 2019 at 12:15 PM Thomas Zimmermann <[email protected]> wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
I think Noralf Tronnes or Gerd Hoffmann would also make good reviewers for this, fairly close to what they've been working on in the past.
I will try to take another look next week. Busy as usual here.
Thanks, I'll post v4 of the patches early next week.
Quoted 72 lines
Christian.
Quoted 69 lines
-Daniel
Quoted 57 lines
Best regards
ThomasAm 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 34 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+ +/** + * Returns the container of type &struct drm_gem_vram_object + * for field bo. + * @bo: the VRAM buffer object + * Returns: The containing GEM VRAM objectQuoted 8 lines
Review
Quoted 6 lines
+ */
(quoted diff) +5
-0+static inline struct drm_gem_vram_object* drm_gem_vram_of_bo( + struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
Quoted 12 lines
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 6 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
Am 03.05.19 um 14:27 schrieb Thomas Zimmermann:
Quoted 1 line
Actually cc him
Quoted 95 lines
Am 03.05.19 um 14:07 schrieb Koenig, Christian:
Quoted 4 lines
Am 03.05.19 um 14:01 schrieb Daniel Vetter:
Quoted 3 lines
[CAUTION: External Email]
On Fri, May 3, 2019 at 12:15 PM Thomas Zimmermann <[email protected]> wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Hi Christian,
would you review the whole patch set? Daniel mentioned that he'd prefer to leave the review to memory-mgmt developers.
I think Noralf Tronnes or Gerd Hoffmann would also make good reviewers for this, fairly close to what they've been working on in the past.
I will try to take another look next week. Busy as usual here.
Thanks, I'll post v4 of the patches early next week.
Quoted 72 lines
Christian.
Quoted 69 lines
-Daniel
Quoted 57 lines
Best regards
ThomasAm 30.04.19 um 11:35 schrieb Koenig, Christian:
Quoted 34 lines
Am 30.04.19 um 11:23 schrieb Sam Ravnborg:
Quoted 25 lines
[CAUTION: External Email]
Hi Thomas.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+ +/** + * Returns the container of type &struct drm_gem_vram_object + * for field bo. + * @bo: the VRAM buffer object + * Returns: The containing GEM VRAM objectQuoted 8 lines
Review
Quoted 6 lines
+ */
(quoted diff) +5
-0+static inline struct drm_gem_vram_object* drm_gem_vram_of_bo( + struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
Quoted 7 lines
If I put the argument next to the function's name, it will exceed the 80-character limit. From the coding-style document, I could not see what to do in this case. One solution would move the return type to a separate line before the function name. I've not seen that anywhere in the source code, so moving the argument onto a separate line and indenting by one tab appears to be the next best solution. Please let me know if there's if there's a preferred style for cases like this one.
Quoted 4 lines
Readability has IMO higher priority than some limit of 80 chars. And it hurts readability (at least my OCD) when style changes as you do with indent here. So my personal preference is to fix indent and accect longer lines.
In this case the an often used convention (which is also kind of readable) is to add a newline after the return values, but before the function name. E.g. something like this:
Quoted 12 lines
static inline struct drm_gem_vram_object*
drm_gem_vram_of_bo(struct ttm_buffer_object *bo)Regards,
Christian.Quoted 6 lines
But you ask for a preferred style - which I do not think we have in this case. So it boils down to what you prefer.
Enough bikeshedding, thanks for the quick response.
Sam
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgQuoted 91 lines · Sam Ravnborg
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 75 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions
Quoted 9 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 7 lines
drivers/gpu/drm/Kconfig +7
-0+config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
It doesn't, randomized builds will go kaboom.
Quoted 18 lines
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select foo
Quoted 5 lines
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
I'm not even clear on why you need 2 symbols here ... If the goal is to create a drm_gem_helper.ko module, then that's a bit more work. Plus anyone needed it would always need to select both Kconfig symbols (because select isn't recursive at all).
I'd just ditch one of them for now and got with DRM_GEM_VRAM_HELPER. -Daniel
Quoted 517 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 8 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgQuoted 91 lines · Sam Ravnborg
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 75 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRM@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions
Quoted 9 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 7 lines
drivers/gpu/drm/Kconfig +7
-0+config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
It doesn't, randomized builds will go kaboom.
Quoted 18 lines
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select foo
Quoted 5 lines
So when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
I'm not even clear on why you need 2 symbols here ... If the goal is to create a drm_gem_helper.ko module, then that's a bit more work. Plus anyone needed it would always need to select both Kconfig symbols (because select isn't recursive at all).
I'd just ditch one of them for now and got with DRM_GEM_VRAM_HELPER. -Daniel
Quoted 517 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 8 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
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
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgQuoted 125 lines · Sam Ravnborg
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 72 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRMdrivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 10 lines
drivers/gpu/drm/Kconfig +7
-0@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select fooSo when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
Quoted 8 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 6 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.
It exists:
https://dri.freedesktop.org/docs/drm/gpu/drm-mm.html#the-graphics-execution-manager-gem
In the same chapter even where this will be added. I do agree that explaining a bit more what's meant with VRAM would be good though. -Daniel
Quoted 507 lines
VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH v3 01/19] drm: Add |struct drm_gem_vram_object| and helpers
In reply to Sam RavnborgQuoted 125 lines · Sam Ravnborg
Hi Thomas.
Some minor things and some bikeshedding too.
One general^Wbikeshedding thing -
unint32_tis used in many places. And then s64 in one place.
Seems like two concepts are mixed.
Maybe be consistent and use u32, s32 everywhere?I did not read the code carefully enough to understand it. I cannot give a r-b or a-b - as I feel I need to understand it to do so.
Sam
Quoted 72 lines · Thomas Zimmermann
The type |struct drm_gem_vram_object| implements a GEM object for simple framebuffer devices with dedicated video memory. The BO is either located in VRAM or system memory.
The implementation has been created from the respective code in ast, bochs and mgag200. These drivers copy their implementation from each other; except for the names of several data types. The helpers are currently build with TTM, but this is considered an implementation detail and may change in future updates.
v2:
* rename to |struct drm_gem_vram_object|
* movedrm_is_gem_ttm()to a later patch in the series
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/drm-mm.rst | 12 + drivers/gpu/drm/Kconfig | 13 + drivers/gpu/drm/Makefile | 4 + drivers/gpu/drm/drm_gem_vram_helper.c | 410 +++++++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + include/drm/drm_gem_vram_helper.h | 92 +++++ 6 files changed, 537 insertions(+) create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c create mode 100644 include/drm/drm_gem_vram_helper.hDocumentation/gpu/drm-mm.rst +12
-0@@ -380,6 +380,18 @@ GEM CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c :export: +GEM VRAM Helper Functions Reference +---------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_vram_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +6
-0@@ -160,6 +160,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_VRAM_HELPER + tristate + depends on DRM && DRM_TTM + help + Helpers for VRAM memory management + config DRM_GEM_CMA_HELPER bool depends on DRMdrivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 194
Quoted 10 lines
drivers/gpu/drm/Kconfig +7
-0@@ -179,6 +185,13 @@ config DRM_GEM_SHMEM_HELPER help Choose this if you need the GEM shmem helper functions +config DRM_GEM_VRAM_HELPER + bool + depends on DRM + select DRM_VRAM_HELPER + help + Choose this if you need the GEM VRAM helper functions +I cannot remember how select will deal with symbols whos has a "depends on".
But if I recall correct then the "depends on" will be ignored or in best case trigger a warning.
In other words - when we have symbols we select they should not have a depends on.What can be done is something like:
symbol foo
boolsymbol bar
depends on foosymbol foobar
bool "This is what you need - select me"
select fooSo when one chooses "foobar" then we will select "foo" and this will satisfy bar.
But maybe this rambling is irrelevant - maybe check what we do with other selectable symbols in DRM.
Quoted 8 lines
drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER
Quoted 6 lines
drivers/gpu/drm/Kconfig +6
-0+/** + * DOC: overview + * + * This library provides a GEM object that is backed by VRAM. It + * can be used for simple framebuffer devices with dedicated memory. + */It is likely only me, but...
I could use a short explanation what is GEM and maybe also VRAM.
It exists:
https://dri.freedesktop.org/docs/drm/gpu/drm-mm.html#the-graphics-execution-manager-gem
In the same chapter even where this will be added. I do agree that explaining a bit more what's meant with VRAM would be good though. -Daniel
Quoted 507 lines
VRAM as video RAM, but maybe there is more constraints? (When I first looked at DRM I wondered what you used Virtual RAM for. But thats a long time ago so it counts only as a funny story.
Quoted 450 lines
+ * Buffer-objects helpers
+ */drivers/gpu/drm/Kconfig +395
-0+ +static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo) +{ + /* We got here via ttm_bo_put(), which means that the + * TTM buffer object in 'bo' has already been cleaned + * up; only release the GEM object. */ + drm_gem_object_release(&gbo->gem); +} + +static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_cleanup(gbo); + kfree(gbo); +} + +static void ttm_buffer_object_destroy(struct ttm_buffer_object *bo) +{ + struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); + drm_gem_vram_destroy(gbo); +} + +static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, int pl_flag) +{ + unsigned int i; + unsigned int c = 0; + + gbo->placement.placement = gbo->placements; + gbo->placement.busy_placement = gbo->placements; + + if (pl_flag & TTM_PL_FLAG_VRAM) + gbo->placements[c++].flags = TTM_PL_FLAG_WC | + TTM_PL_FLAG_UNCACHED | + TTM_PL_FLAG_VRAM; + + if (pl_flag & TTM_PL_FLAG_SYSTEM) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + if (!c) + gbo->placements[c++].flags = TTM_PL_MASK_CACHING | + TTM_PL_FLAG_SYSTEM; + + gbo->placement.num_placement = c; + gbo->placement.num_busy_placement = c; + + for (i = 0; i < c; ++i) { + gbo->placements[i].fpfn = 0; + gbo->placements[i].lpfn = 0; + } +} + +static int drm_gem_vram_init(struct drm_device *dev, + struct ttm_bo_device *bdev, + struct drm_gem_vram_object *gbo, + unsigned long size, uint32_t pg_align, + bool interruptible) +{ + int ret; + size_t acc_size; + + ret = drm_gem_object_init(dev, &gbo->gem, size); + if (ret) + return ret; + + acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo)); + + gbo->bo.bdev = bdev; + 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, + NULL, NULL, ttm_buffer_object_destroy); + if (ret) + goto err_drm_gem_object_release; + + return 0; + +err_drm_gem_object_release: + drm_gem_object_release(&gbo->gem); + return ret; +} + +/** + * 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 + * @interruptible: sleep interruptible if waiting for memory + * + * Returns: + * A new instance of &struct drm_gem_vram_object on success, or + * 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, + unsigned long size, + uint32_t pg_align, + bool interruptible) +{ + struct drm_gem_vram_object *gbo; + int ret; + + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL); + if (!gbo) + return ERR_PTR(-ENOMEM); + + ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible); + if (ret < 0) + goto err_kfree; + + return gbo; + +err_kfree: + kfree(gbo); + return ERR_PTR(ret); +} +EXPORT_SYMBOL(drm_gem_vram_create); + +/** + * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * + * See ttm_bo_put() for more information. + */ +void drm_gem_vram_put(struct drm_gem_vram_object *gbo) +{ + ttm_bo_put(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_put); + +/** + * drm_gem_vram_reserve() - Reserves a VRAM-backed GEM object + * @gbo: the GEM VRAM object + * @no_wait: don't wait for buffer object to become available + * + * See ttm_bo_reserve() for more information. + * + * Returns: + * 0 on success, or + * a negative error code otherwise + */ +int drm_gem_vram_reserve(struct drm_gem_vram_object *gbo, bool no_wait) +{ + return ttm_bo_reserve(&gbo->bo, true, no_wait, NULL); +} +EXPORT_SYMBOL(drm_gem_vram_reserve); + +/** + * drm_gem_vram_unreserve() - \ + Release a reservation acquired by drm_gem_vram_reserve() + * @gbo: the GEM VRAM object + * + * See ttm_bo_unreserve() for more information. + */ +void drm_gem_vram_unreserve(struct drm_gem_vram_object *gbo) +{ + ttm_bo_unreserve(&gbo->bo); +} +EXPORT_SYMBOL(drm_gem_vram_unreserve); + +/** + * drm_gem_vram_mmap_offset() - Returns a GEM VRAM object's mmap offset + * @gbo: the GEM VRAM object + * + * See drm_vma_node_offset_addr() for more information. + * + * Returns: + * The buffer object's offset for userspace mappings on success, or + * 0 if no offset is allocated. + */ +u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) +{ + return drm_vma_node_offset_addr(&gbo->bo.vma_node); +} +EXPORT_SYMBOL(drm_gem_vram_mmap_offset); + +/** + * drm_gem_vram_offset() - \ + Returns a GEM VRAM object's offset in video memory + * @gbo: the GEM VRAM object + * + * This function returns the buffer object's offset in the device's video + * memory. The buffer object has to be pinned to %TTM_PL_VRAM. + * + * Returns: + * The buffer object's offset in video memory on success, or + * a negative error code otherwise. + */ +s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) +{ + if (!gbo->pin_count) + return (s64)-ENODEV; + return gbo->bo.offset; +} +EXPORT_SYMBOL(drm_gem_vram_offset); + +/** + * drm_gem_vram_pin() - Pins a GEM VRAM object in a region. + * @gbo: the GEM VRAM object + * @pl_flag: a bitmask of possible memory regions + * + * Pinning a buffer object ensures that it is not evicted from + * a memory region. A pinned buffer object has to be unpinned before + * it can be pinned to another region. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, u32 pl_flag) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (gbo->pin_count) { + ++gbo->pin_count; + return 0; + } + + drm_gem_vram_placement(gbo, pl_flag); + for (i = 0; i < gbo->placement.num_placement; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + gbo->pin_count = 1; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_pin); + +/** + * drm_gem_vram_unpin() - Unpins a GEM VRAM object + * @gbo: the GEM VRAM object + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_unpin); + +/** + * drm_gem_vram_push_to_system() - \ + Unpins a GEM VRAM object and moves it to system memory + * @gbo: the GEM VRAM object + * + * This operation only works if the caller holds the final pin on the + * buffer object. + * + * Returns: + * 0 on success, or + * a negative error code otherwise. + */ +int drm_gem_vram_push_to_system(struct drm_gem_vram_object *gbo) +{ + int i, ret; + struct ttm_operation_ctx ctx = { false, false }; + + if (!gbo->pin_count) + return 0; + + --gbo->pin_count; + if (gbo->pin_count) + return 0; + + if (gbo->kmap.virtual) + ttm_bo_kunmap(&gbo->kmap); + + drm_gem_vram_placement(gbo, TTM_PL_FLAG_SYSTEM); + for (i = 0; i < gbo->placement.num_placement ; ++i) + gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + + ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_gem_vram_push_to_system); + +/** + * drm_gem_vram_kmap_at() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * @kmap: the mapping's kmap object + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap_at(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem, struct ttm_bo_kmap_obj *kmap) +{ + int ret; + + if (kmap->virtual || !map) + goto out; + + ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, kmap); + if (ret) + return ERR_PTR(ret); + +out: + if (!is_iomem) { + return kmap->virtual; + } + if (!kmap->virtual) { + *is_iomem = false; + return NULL; + } + return ttm_kmap_obj_virtual(kmap, is_iomem); +} +EXPORT_SYMBOL(drm_gem_vram_kmap_at); + +/** + * drm_gem_vram_kmap() - Maps a GEM VRAM object into kernel address space + * @gbo: the GEM VRAM object + * @map: establish a mapping if necessary + * @is_iomem: returns true if the mapped memory is I/O memory, or false \ + otherwise; can be NULL + * + * This function maps the buffer object into the kernel's address space + * or returns the current mapping. If the parameter map is false, the + * function only queries the current mapping, but does not establish a + * new one. + * + * Returns: + * The buffers virtual address if mapped, or + * NULL if not mapped, or + * an ERR_PTR()-encoded error code otherwise. + */ +void* drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map, + bool *is_iomem) +{ + return drm_gem_vram_kmap_at(gbo, map, is_iomem, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kmap); + +/** + * drm_gem_vram_kunmap_at() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + * @kmap: the mapping's kmap object + */ +void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, + struct ttm_bo_kmap_obj *kmap) +{ + if (!kmap->virtual) + return; + + ttm_bo_kunmap(kmap); + kmap->virtual = NULL; +} +EXPORT_SYMBOL(drm_gem_vram_kunmap_at); + +/** + * drm_gem_vram_kunmap() - Unmaps a GEM VRAM object + * @gbo: the GEM VRAM object + */ +void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) +{ + drm_gem_vram_kunmap_at(gbo, &gbo->kmap); +} +EXPORT_SYMBOL(drm_gem_vram_kunmap);drivers/gpu/drm/drm_vram_helper_common.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <linux/module.h> + +MODULE_DESCRIPTION ("DRM VRAM memory-management helpers" ); +MODULE_LICENSE ("GPL" );include/drm/drm_gem_vram_helper.h new file +35
-0@@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_VRAM_HELPER_H +#define DRM_GEM_VRAM_HELPER_H + +#include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> +#include <linux/kernel.h> /* for container_of() */ + +struct filp ; + +#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM +#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM + +/* +* Buffer-object helpers +*/ + +/** +* struct drm_gem_vram_object - GEM object backed by VRAM +* @gem: GEM object +* @bo: TTM buffer object +* @kmap: Mapping information for @bo +* @placement: TTM placement information. Supported placements are \ +%TTM_PL_VRAM and %TTM_PL_SYSTEM +* @placements: TTM placement information. +* @pin_count: Pin counter +* +* The type struct drm_gem_vram_object represents a GEM object that is +* backed by VRAM. It can be used for simple frambuffer devices with +* dedicated memory. The buffer object can be evicted to system memory if +* video memory becomes scarce. +*/ +struct drm_gem_vram_object {include/drm/drm_gem_vram_helper.h line 45
Quoted 10 lines
include/drm/drm_gem_vram_helper.h new file +10
-0+struct drm_gem_object gem; +struct ttm_buffer_object bo; +struct ttm_bo_kmap_obj kmap; + +/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ +struct ttm_placement placement; +struct ttm_place placements[3 ]; + +int pin_count; +};Use tabs for indent - not spaces.
Ask checkpatch if anything similar needs to be adjusted.include/drm/drm_gem_vram_helper.h line 57
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field bo. +* @bo: the VRAM buffer object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_bo ( +struct ttm_buffer_object *bo) +{ + return container_of(bo, struct drm_gem_vram_object, bo); +}Indent funny. USe same indent as used in other parts of file for function arguments.
include/drm/drm_gem_vram_helper.h line 69
Quoted 12 lines
include/drm/drm_gem_vram_helper.h new file +12
-0+ +/** +* Returns the container of type &struct drm_gem_vram_object +* for field gem. +* @gem: the GEM object +* Returns: The containing GEM VRAM object +*/ +static inline struct drm_gem_vram_object *drm_gem_vram_of_gem ( +struct drm_gem_object *gem) +{ + return container_of(gem, struct drm_gem_vram_object, gem); +}ditto
include/drm/drm_gem_vram_helper.h line 75
Quoted 6 lines
include/drm/drm_gem_vram_helper.h new file +6
-0+ +struct drm_gem_vram_object *drm_gem_vram_create (struct drm_device *dev, +struct ttm_bo_device * bdev, +unsigned long size, +uint32_t pg_align, +bool interruptible);Here is is "normal"
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
maintainerPATCH v3 2/19 drm: Add |struct drm_gem_vram_object| callbacks for |struct ttm_bo_driver|
In reply to Thomas ZimmermannThe provided helpers can be used for the respective callback functions in |struct ttm_bo_driver|.
v2:
* drm_is_gem_vram() is now a private function
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 50 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 10 ++++++ 2 files changed, 60 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +50 -0
@@ -408,3 +408,53 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo)drm_gem_vram_kunmap_at (gbo, &gbo->kmap); }EXPORT_SYMBOL (drm_gem_vram_kunmap); + +/* +* Helpers for struct ttm_bo_driver +*/ + +static bool drm_is_gem_vram (struct ttm_buffer_object *bo) +{ +return (bo->destroy == ttm_buffer_object_destroy); +} + +/** +* drm_gem_vram_bo_driver_evict_flags() - \ +Implements &struct ttm_bo_driver.evict_flags +* @bo: TTM buffer object. Refers to &struct drm_gem_vram_object.bo +* @pl: TTM placement information. +*/ +void drm_gem_vram_bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *pl) +{ +struct drm_gem_vram_object *gbo; + +/* TTM may pass BOs that are not GEM VRAM BOs. */ +if (!drm_is_gem_vram (bo)) +return ; + + gbo =drm_gem_vram_of_bo (bo); +drm_gem_vram_placement (gbo,TTM_PL_FLAG_SYSTEM ); + *pl = gbo->placement; +} +EXPORT_SYMBOL (drm_gem_vram_bo_driver_evict_flags); + +/** +* drm_gem_vram_bo_driver_verify_access() - \ +Implements &struct ttm_bo_driver.verify_access +* @bo: TTM buffer object. Refers to &struct drm_gem_vram_object.bo +* @filp: File pointer. +* +* Returns: +* 0 on success, or +* a negative errno code otherwise. +*/ +int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp) +{ +struct drm_gem_vram_object *gbo =drm_gem_vram_of_bo (bo); + +return drm_vma_node_verify_access (&gbo->gem.vma_node, + filp->private_data); +} +EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access);
include/drm/drm_gem_vram_helper.h +10 -0
@@ -89,4 +89,14 @@ void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, struct ttm_bo_kmap_obj *kmap);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +/* +* Helpers for struct ttm_bo_driver +*/ + +void drm_gem_vram_bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *pl); + +int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp); +#endif
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 2/19 drm: Add |struct drm_gem_vram_object| callbacks for |struct ttm_bo_driver|
In reply to Thomas ZimmermannThe provided helpers can be used for the respective callback functions in |struct ttm_bo_driver|.
v2:
* drm_is_gem_vram() is now a private function
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 50 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 10 ++++++ 2 files changed, 60 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +50 -0
@@ -408,3 +408,53 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo)drm_gem_vram_kunmap_at (gbo, &gbo->kmap); }EXPORT_SYMBOL (drm_gem_vram_kunmap); + +/* +* Helpers for struct ttm_bo_driver +*/ + +static bool drm_is_gem_vram (struct ttm_buffer_object *bo) +{ +return (bo->destroy == ttm_buffer_object_destroy); +} + +/** +* drm_gem_vram_bo_driver_evict_flags() - \ +Implements &struct ttm_bo_driver.evict_flags +* @bo: TTM buffer object. Refers to &struct drm_gem_vram_object.bo +* @pl: TTM placement information. +*/ +void drm_gem_vram_bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *pl) +{ +struct drm_gem_vram_object *gbo; + +/* TTM may pass BOs that are not GEM VRAM BOs. */ +if (!drm_is_gem_vram (bo)) +return ; + + gbo =drm_gem_vram_of_bo (bo); +drm_gem_vram_placement (gbo,TTM_PL_FLAG_SYSTEM ); + *pl = gbo->placement; +} +EXPORT_SYMBOL (drm_gem_vram_bo_driver_evict_flags); + +/** +* drm_gem_vram_bo_driver_verify_access() - \ +Implements &struct ttm_bo_driver.verify_access +* @bo: TTM buffer object. Refers to &struct drm_gem_vram_object.bo +* @filp: File pointer. +* +* Returns: +* 0 on success, or +* a negative errno code otherwise. +*/ +int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp) +{ +struct drm_gem_vram_object *gbo =drm_gem_vram_of_bo (bo); + +return drm_vma_node_verify_access (&gbo->gem.vma_node, + filp->private_data); +} +EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access);
include/drm/drm_gem_vram_helper.h +10 -0
@@ -89,4 +89,14 @@ void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, struct ttm_bo_kmap_obj *kmap);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +/* +* Helpers for struct ttm_bo_driver +*/ + +void drm_gem_vram_bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *pl); + +int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp); +#endif
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 3/19 drm: Add |struct drm_gem_vram_object| callbacks for |struct drm_driver|
In reply to Thomas ZimmermannThe provided helpers can be used for the respective callback functions in |struct drm_driver|.
v2:
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 48 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 10 ++++++ 2 files changed, 58 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +48 -0
@@ -458,3 +458,51 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo, filp->private_data); }EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access); + +/* +* Helpers for struct drm_driver +*/ + +/** +* drm_gem_vram_driver_gem_free_object_unlocked() - \ +Implements &struct drm_driver.gem_free_object_unlocked +* @gem: GEM object. Refers to &struct drm_gem_vram_object.gem +*/ +void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem) +{ +struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); +drm_gem_vram_put (gbo); +} +EXPORT_SYMBOL (drm_gem_vram_driver_gem_free_object_unlocked); + +/** +* drm_gem_vram_driver_dumb_mmap_offset() - \ +Implements &struct drm_driver.dumb_mmap_offset +* @file: DRM file pointer. +* @dev: DRM device. +* @handle: GEM handle +* @offset: Returns the mapping's memory offset on success +* +* Returns: +* 0 on success, or +* a negative errno code otherwise. +*/ +int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file, +struct drm_device *dev, +uint32_t handle,uint64_t *offset) +{ +struct drm_gem_object *gem; +struct drm_gem_vram_object *gbo; + + gem =drm_gem_object_lookup (file, handle); +if (!gem) +return -ENOENT ; + + gbo =drm_gem_vram_of_gem (gem); + *offset =drm_gem_vram_mmap_offset (gbo); + +drm_gem_object_put_unlocked (gem); + +return 0 ; +} +EXPORT_SYMBOL (drm_gem_vram_driver_dumb_mmap_offset);
include/drm/drm_gem_vram_helper.h +10 -0
@@ -99,4 +99,14 @@ void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo,struct file *filp); +/* +* Helpers for struct drm_driver +*/ + +void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem); + +int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file, +struct drm_device *dev, +uint32_t handle,uint64_t *offset); +#endif
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 3/19 drm: Add |struct drm_gem_vram_object| callbacks for |struct drm_driver|
In reply to Thomas ZimmermannThe provided helpers can be used for the respective callback functions in |struct drm_driver|.
v2:
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 48 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 10 ++++++ 2 files changed, 58 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +48 -0
@@ -458,3 +458,51 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo, filp->private_data); }EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access); + +/* +* Helpers for struct drm_driver +*/ + +/** +* drm_gem_vram_driver_gem_free_object_unlocked() - \ +Implements &struct drm_driver.gem_free_object_unlocked +* @gem: GEM object. Refers to &struct drm_gem_vram_object.gem +*/ +void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem) +{ +struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); +drm_gem_vram_put (gbo); +} +EXPORT_SYMBOL (drm_gem_vram_driver_gem_free_object_unlocked); + +/** +* drm_gem_vram_driver_dumb_mmap_offset() - \ +Implements &struct drm_driver.dumb_mmap_offset +* @file: DRM file pointer. +* @dev: DRM device. +* @handle: GEM handle +* @offset: Returns the mapping's memory offset on success +* +* Returns: +* 0 on success, or +* a negative errno code otherwise. +*/ +int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file, +struct drm_device *dev, +uint32_t handle,uint64_t *offset) +{ +struct drm_gem_object *gem; +struct drm_gem_vram_object *gbo; + + gem =drm_gem_object_lookup (file, handle); +if (!gem) +return -ENOENT ; + + gbo =drm_gem_vram_of_gem (gem); + *offset =drm_gem_vram_mmap_offset (gbo); + +drm_gem_object_put_unlocked (gem); + +return 0 ; +} +EXPORT_SYMBOL (drm_gem_vram_driver_dumb_mmap_offset);
include/drm/drm_gem_vram_helper.h +10 -0
@@ -99,4 +99,14 @@ void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo,struct file *filp); +/* +* Helpers for struct drm_driver +*/ + +void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem); + +int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file, +struct drm_device *dev, +uint32_t handle,uint64_t *offset); +#endif
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 4/19 drm: Add drm_gem_vram_fill_create_dumb() to create dumb buffers
In reply to Thomas ZimmermannThe helper function drm_gem_vram_fill_create_dumb() implements most of struct drm_driver.dumb_create() for GEM-VRAM buffer objects. It's not a full implemenation of the callback, as several driver-specific parameters are still required.
v2:
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 62 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 8 ++++ 2 files changed, 70 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +62 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_mode.h> #include <drm/ttm/ttm_page_alloc.h> /**
@@ -409,6 +410,67 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_kunmap); +/** +* drm_gem_vram_fill_create_dumb() - \ +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 +* @interruptible: sleep interruptible if waiting for memory +* @args: the arguments as provided to \ +&struct drm_driver.dumb_create +* +* This helper function fills &struct drm_mode_create_dumb, which is used +* by &struct drm_driver.dumb_create. Implementations of this interface +* should forwards their arguments to this helper, plus the driver-specific +* parameters. +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_gem_vram_fill_create_dumb (struct drm_file *file, +struct drm_device *dev, +struct ttm_bo_device *bdev, +uint32_t pg_align, +bool interruptible, +struct drm_mode_create_dumb *args) +{ +size_t pitch, size; +struct drm_gem_vram_object *gbo; +int ret; +u32 handle; + + pitch = args->width * ((args->bpp +7 ) /8 ); + size = pitch * args->height; + + size =roundup (size,PAGE_SIZE ); +if (!size) +return -EINVAL ; + + gbo =drm_gem_vram_create (dev, bdev, size, pg_align, interruptible); +if (IS_ERR (gbo)) +return PTR_ERR (gbo); + + ret =drm_gem_handle_create (file, &gbo->gem, &handle); +if (ret) + goto err_drm_gem_object_put_unlocked; + +drm_gem_object_put_unlocked (&gbo->gem); + + args->pitch = pitch; + args->size = size; + args->handle = handle; + +return 0 ; + +err_drm_gem_object_put_unlocked: +drm_gem_object_put_unlocked (&gbo->gem); +return ret; +} +EXPORT_SYMBOL (drm_gem_vram_fill_create_dumb); +/* * Helpers for struct ttm_bo_driver */
include/drm/drm_gem_vram_helper.h +8 -0
@@ -8,6 +8,7 @@#include <drm/ttm/ttm_placement.h> #include <linux/kernel.h> /* for container_of() */ +struct drm_mode_create_dumb ;struct filp ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM
@@ -89,6 +90,13 @@ void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, struct ttm_bo_kmap_obj *kmap);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +int drm_gem_vram_fill_create_dumb (struct drm_file *file, +struct drm_device *dev, +struct ttm_bo_device *bdev, +uint32_t pg_align, +bool interruptible, +struct drm_mode_create_dumb *args); +/* * Helpers for struct ttm_bo_driver */
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 4/19 drm: Add drm_gem_vram_fill_create_dumb() to create dumb buffers
In reply to Thomas ZimmermannThe helper function drm_gem_vram_fill_create_dumb() implements most of struct drm_driver.dumb_create() for GEM-VRAM buffer objects. It's not a full implemenation of the callback, as several driver-specific parameters are still required.
v2:
* documentation fixes
--- drivers/gpu/drm/drm_gem_vram_helper.c | 62 +++++++++++++++++++++++++++ include/drm/drm_gem_vram_helper.h | 8 ++++ 2 files changed, 70 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +62 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_mode.h> #include <drm/ttm/ttm_page_alloc.h> /**
@@ -409,6 +410,67 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_kunmap); +/** +* drm_gem_vram_fill_create_dumb() - \ +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 +* @interruptible: sleep interruptible if waiting for memory +* @args: the arguments as provided to \ +&struct drm_driver.dumb_create +* +* This helper function fills &struct drm_mode_create_dumb, which is used +* by &struct drm_driver.dumb_create. Implementations of this interface +* should forwards their arguments to this helper, plus the driver-specific +* parameters. +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_gem_vram_fill_create_dumb (struct drm_file *file, +struct drm_device *dev, +struct ttm_bo_device *bdev, +uint32_t pg_align, +bool interruptible, +struct drm_mode_create_dumb *args) +{ +size_t pitch, size; +struct drm_gem_vram_object *gbo; +int ret; +u32 handle; + + pitch = args->width * ((args->bpp +7 ) /8 ); + size = pitch * args->height; + + size =roundup (size,PAGE_SIZE ); +if (!size) +return -EINVAL ; + + gbo =drm_gem_vram_create (dev, bdev, size, pg_align, interruptible); +if (IS_ERR (gbo)) +return PTR_ERR (gbo); + + ret =drm_gem_handle_create (file, &gbo->gem, &handle); +if (ret) + goto err_drm_gem_object_put_unlocked; + +drm_gem_object_put_unlocked (&gbo->gem); + + args->pitch = pitch; + args->size = size; + args->handle = handle; + +return 0 ; + +err_drm_gem_object_put_unlocked: +drm_gem_object_put_unlocked (&gbo->gem); +return ret; +} +EXPORT_SYMBOL (drm_gem_vram_fill_create_dumb); +/* * Helpers for struct ttm_bo_driver */
include/drm/drm_gem_vram_helper.h +8 -0
@@ -8,6 +8,7 @@#include <drm/ttm/ttm_placement.h> #include <linux/kernel.h> /* for container_of() */ +struct drm_mode_create_dumb ;struct filp ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM
@@ -89,6 +90,13 @@ void drm_gem_vram_kunmap_at(struct drm_gem_vram_object *gbo, struct ttm_bo_kmap_obj *kmap);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +int drm_gem_vram_fill_create_dumb (struct drm_file *file, +struct drm_device *dev, +struct ttm_bo_device *bdev, +uint32_t pg_align, +bool interruptible, +struct drm_mode_create_dumb *args); +/* * Helpers for struct ttm_bo_driver */
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 5/19 drm: Add VRAM MM, a simple memory manager for dedicated VRAM
In reply to Thomas ZimmermannThe VRAM MM memory manager is a helper library that manages dedicated video memory of simple framebuffer devices. It is supported to be used with struct drm_gem_vram_object, but does not depend on it.
The implementation is based on the respective code from ast, bochs, and mgag200. These drivers share the exact same implementation except for type names. The helpers are currently build with TTM. This may change in future revisions.
v2:
* renamed to struct drm_vram_mm
* add drm_vram_mm_mmap() helper
* documentation fixes
--- Documentation/gpu/drm-mm.rst | 13 +- drivers/gpu/drm/Kconfig | 7 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_vram_mm_helper.c | 210 +++++++++++++++++++++++++++ include/drm/drm_vram_mm_helper.h | 67 +++++++++ 5 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c create mode 100644 include/drm/drm_vram_mm_helper.h
Documentation/gpu/drm-mm.rst +12 -1
@@ -79,7 +79,6 @@ count for the TTM, which will call your initialization function. See the radeon_ttm.c file for an example of usage. - The Graphics Execution Manager (GEM) ====================================
@@ -392,6 +391,18 @@ GEM VRAM Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c :export: +VRAM MM Helper Functions Reference +------------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_vram_mm_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c + :export: + VMA Offset Manager ==================
drivers/gpu/drm/Kconfig +7 -0
@@ -166,6 +166,13 @@ config DRM_VRAM_HELPER help Helpers for VRAM memory management +config DRM_VRAM_MM_HELPER + tristate + depends on DRM && DRM_TTM + select DRM_VRAM_HELPER + help + Choose this if you need the VRAM MM helper functions + config DRM_GEM_CMA_HELPER bool depends on DRM
drivers/gpu/drm/Makefile +1 -0
@@ -34,6 +34,7 @@ drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm_vram_helper-y := drm_vram_helper_common.o drm_vram_helper-$(CONFIG_DRM_GEM_VRAM_HELPER) += drm_gem_vram_helper.o +drm_vram_helper-$(CONFIG_DRM_VRAM_MM_HELPER) += drm_vram_mm_helper.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \
drivers/gpu/drm/drm_vram_mm_helper.c new file +210 -0
210 lines not on this page · raw message
include/drm/drm_vram_mm_helper.h new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 5/19 drm: Add VRAM MM, a simple memory manager for dedicated VRAM
In reply to Thomas ZimmermannThe VRAM MM memory manager is a helper library that manages dedicated video memory of simple framebuffer devices. It is supported to be used with struct drm_gem_vram_object, but does not depend on it.
The implementation is based on the respective code from ast, bochs, and mgag200. These drivers share the exact same implementation except for type names. The helpers are currently build with TTM. This may change in future revisions.
v2:
* renamed to struct drm_vram_mm
* add drm_vram_mm_mmap() helper
* documentation fixes
--- Documentation/gpu/drm-mm.rst | 13 +- drivers/gpu/drm/Kconfig | 7 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_vram_mm_helper.c | 210 +++++++++++++++++++++++++++ include/drm/drm_vram_mm_helper.h | 67 +++++++++ 5 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c create mode 100644 include/drm/drm_vram_mm_helper.h
Documentation/gpu/drm-mm.rst +12 -1
@@ -79,7 +79,6 @@ count for the TTM, which will call your initialization function. See the radeon_ttm.c file for an example of usage. - The Graphics Execution Manager (GEM) ====================================
@@ -392,6 +391,18 @@ GEM VRAM Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c :export: +VRAM MM Helper Functions Reference +------------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_vram_mm_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c + :export: + VMA Offset Manager ==================
drivers/gpu/drm/Kconfig +7 -0
@@ -166,6 +166,13 @@ config DRM_VRAM_HELPER help Helpers for VRAM memory management +config DRM_VRAM_MM_HELPER + tristate + depends on DRM && DRM_TTM + select DRM_VRAM_HELPER + help + Choose this if you need the VRAM MM helper functions + config DRM_GEM_CMA_HELPER bool depends on DRM
drivers/gpu/drm/Makefile +1 -0
@@ -34,6 +34,7 @@ drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm_vram_helper-y := drm_vram_helper_common.o drm_vram_helper-$(CONFIG_DRM_GEM_VRAM_HELPER) += drm_gem_vram_helper.o +drm_vram_helper-$(CONFIG_DRM_VRAM_MM_HELPER) += drm_vram_mm_helper.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \
drivers/gpu/drm/drm_vram_mm_helper.c new file +210 -0
210 lines not on this page · raw message
include/drm/drm_vram_mm_helper.h new file +67 -0
67 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 6/19 drm: Add default instance for VRAM MM callback functions
In reply to Thomas ZimmermannVRAM MM is most likely be used with GEM VRAM. The latter now provides the required instance of struct drm_vram_mm_funcs for drivers to use.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 14 ++++++++++++++ include/drm/drm_gem_vram_helper.h | 3 +++ 2 files changed, 17 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +14 -0
@@ -2,6 +2,7 @@#include <drm/drm_gem_vram_helper.h> #include <drm/drm_mode.h> +#include <drm/drm_vram_mm_helper.h> #include <drm/ttm/ttm_page_alloc.h> /**
@@ -521,6 +522,19 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo, }EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access); +/** +* drm_gem_vram_mm_funcs - Functions for &struct drm_vram_mm +* +* Most users of @struct drm_gem_vram_object will also use +* @struct drm_vram_mm. This instance of &struct drm_vram_mm_funcs +* can be used to connect both. +*/ +const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs = { + .evict_flags = drm_gem_vram_bo_driver_evict_flags, + .verify_access = drm_gem_vram_bo_driver_verify_access +}; +EXPORT_SYMBOL (drm_gem_vram_mm_funcs); +/* * Helpers for struct drm_driver */
include/drm/drm_gem_vram_helper.h +3 -0
@@ -9,6 +9,7 @@#include <linux/kernel.h> /* for container_of() */ struct drm_mode_create_dumb ; +struct drm_vram_mm_funcs ;struct filp ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM
@@ -107,6 +108,8 @@ void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo,struct file *filp); +extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs; +/* * Helpers for struct drm_driver */
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 6/19 drm: Add default instance for VRAM MM callback functions
In reply to Thomas ZimmermannVRAM MM is most likely be used with GEM VRAM. The latter now provides the required instance of struct drm_vram_mm_funcs for drivers to use.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 14 ++++++++++++++ include/drm/drm_gem_vram_helper.h | 3 +++ 2 files changed, 17 insertions(+)
drivers/gpu/drm/drm_gem_vram_helper.c +14 -0
@@ -2,6 +2,7 @@#include <drm/drm_gem_vram_helper.h> #include <drm/drm_mode.h> +#include <drm/drm_vram_mm_helper.h> #include <drm/ttm/ttm_page_alloc.h> /**
@@ -521,6 +522,19 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo, }EXPORT_SYMBOL (drm_gem_vram_bo_driver_verify_access); +/** +* drm_gem_vram_mm_funcs - Functions for &struct drm_vram_mm +* +* Most users of @struct drm_gem_vram_object will also use +* @struct drm_vram_mm. This instance of &struct drm_vram_mm_funcs +* can be used to connect both. +*/ +const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs = { + .evict_flags = drm_gem_vram_bo_driver_evict_flags, + .verify_access = drm_gem_vram_bo_driver_verify_access +}; +EXPORT_SYMBOL (drm_gem_vram_mm_funcs); +/* * Helpers for struct drm_driver */
include/drm/drm_gem_vram_helper.h +3 -0
@@ -9,6 +9,7 @@#include <linux/kernel.h> /* for container_of() */ struct drm_mode_create_dumb ; +struct drm_vram_mm_funcs ;struct filp ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM
@@ -107,6 +108,8 @@ void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,int drm_gem_vram_bo_driver_verify_access (struct ttm_buffer_object *bo,struct file *filp); +extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs; +/* * Helpers for struct drm_driver */
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 7/19 drm: Integrate VRAM MM into struct drm_device
In reply to Thomas ZimmermannThere's no a pointer to struct drm_vram_mm stored in struct drm_device. DRM drivers that use VRAM MM should use this field to refer to their instance of the data structure. Appropriate helpers are now provided as well.
Adding struct drm_vram_mm to struct drm_device further avoids wrappers and boilerplate code in drivers. This patch implements default functions for callbacks in struct drm_driver and struct file_operations that use the struct drm_vram_mm stored in struct drm_device. Drivers that need to provide their own implementations can still do so.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 28 +++++++++++ drivers/gpu/drm/drm_vram_mm_helper.c | 68 +++++++++++++++++++++++++++ include/drm/drm_device.h | 4 ++ include/drm/drm_gem_vram_helper.h | 18 ++++++- include/drm/drm_vram_mm_helper.h | 32 +++++++++++++ 5 files changed, 149 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_vram_helper.c +28 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_device.h> #include <drm/drm_mode.h> #include <drm/drm_vram_mm_helper.h> #include <drm/ttm/ttm_page_alloc.h>
@@ -551,6 +552,33 @@ void drm_gem_vram_driver_gem_free_object_unlocked(struct drm_gem_object *gem) }EXPORT_SYMBOL (drm_gem_vram_driver_gem_free_object_unlocked); +/** +* drm_gem_vram_driver_create_dumb() - \ +Implements &struct drm_driver.dumb_create +* @file: the DRM file +* @dev: the DRM device +* @args: the arguments as provided to \ +&struct drm_driver.dumb_create +* +* This function requires the driver to use @drm_device.vram_mm for its +* instance of VRAM MM. +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +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 , + false, args); +} +EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create); +/** * drm_gem_vram_driver_dumb_mmap_offset() - \ Implements &struct drm_driver.dumb_mmap_offset
drivers/gpu/drm/drm_vram_mm_helper.c +68 -0
71 lines not on this page · raw message
include/drm/drm_device.h +4 -0
@@ -17,6 +17,7 @@ struct drm_vblank_crtc;struct drm_sg_mem ;struct drm_local_map ;struct drm_vma_offset_manager ; +struct drm_vram_mm ;struct drm_fb_helper ;struct inode ;
@@ -286,6 +287,9 @@ struct drm_device {/** @vma_offset_manager: GEM information */ struct drm_vma_offset_manager *vma_offset_manager; +/** @vram_mm: VRAM MM memory manager */ +struct drm_vram_mm *vram_mm; +/** * @switch_power_state: *
include/drm/drm_gem_vram_helper.h +17 -1
@@ -11,6 +11,7 @@struct drm_mode_create_dumb ;struct drm_vram_mm_funcs ;struct filp ; +struct vm_area_struct ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM
@@ -115,9 +116,24 @@ extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs;*/ void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem); - +int drm_gem_vram_driver_dumb_create (struct drm_file *file, +struct drm_device *dev, +struct drm_mode_create_dumb *args);int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset); +/** +* define DRM_GEM_VRAM_DRIVER - default callback functions for \ +&struct drm_driver +* +* Drivers that use VRAM MM and GEM VRAM can use this macro to initialize +* &struct drm_driver with default functions. +*/ +#define DRM_GEM_VRAM_DRIVER \ + .gem_free_object_unlocked = \ + drm_gem_vram_driver_gem_free_object_unlocked, \ + .dumb_create = drm_gem_vram_driver_dumb_create, \ + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset +#endif
include/drm/drm_vram_mm_helper.h +32 -0
@@ -64,4 +64,36 @@ void drm_vram_mm_cleanup(struct drm_vram_mm *vmm);int drm_vram_mm_mmap (struct file *filp,struct vm_area_struct *vma,struct drm_vram_mm *vmm); +/* +* Helpers for integration with struct drm_device +*/ + +struct drm_vram_mm *drm_vram_helper_alloc_mm ( +struct drm_device *dev,u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs); +void drm_vram_helper_release_mm (struct drm_device *dev); + +/* +* Helpers for &struct file_operations +*/ + +int drm_vram_mm_file_operations_mmap ( +struct file *filp,struct vm_area_struct *vma); + +/** +* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \ +&struct file_operations +* +* Drivers that use VRAM MM can use this macro to initialize +* &struct file_operations with default functions. +*/ +#define DRM_VRAM_MM_FILE_OPERATIONS \ + .open = drm_open, \ + .release = drm_release, \ + .unlocked_ioctl = drm_ioctl, \ + .mmap = drm_vram_mm_file_operations_mmap, \ + .poll = drm_poll, \ + .compat_ioctl = drm_compat_ioctl, \ + .read = drm_read +#endif
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 7/19 drm: Integrate VRAM MM into struct drm_device
In reply to Thomas ZimmermannThere's no a pointer to struct drm_vram_mm stored in struct drm_device. DRM drivers that use VRAM MM should use this field to refer to their instance of the data structure. Appropriate helpers are now provided as well.
Adding struct drm_vram_mm to struct drm_device further avoids wrappers and boilerplate code in drivers. This patch implements default functions for callbacks in struct drm_driver and struct file_operations that use the struct drm_vram_mm stored in struct drm_device. Drivers that need to provide their own implementations can still do so.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 28 +++++++++++ drivers/gpu/drm/drm_vram_mm_helper.c | 68 +++++++++++++++++++++++++++ include/drm/drm_device.h | 4 ++ include/drm/drm_gem_vram_helper.h | 18 ++++++- include/drm/drm_vram_mm_helper.h | 32 +++++++++++++ 5 files changed, 149 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_vram_helper.c +28 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_device.h> #include <drm/drm_mode.h> #include <drm/drm_vram_mm_helper.h> #include <drm/ttm/ttm_page_alloc.h>
@@ -551,6 +552,33 @@ void drm_gem_vram_driver_gem_free_object_unlocked(struct drm_gem_object *gem) }EXPORT_SYMBOL (drm_gem_vram_driver_gem_free_object_unlocked); +/** +* drm_gem_vram_driver_create_dumb() - \ +Implements &struct drm_driver.dumb_create +* @file: the DRM file +* @dev: the DRM device +* @args: the arguments as provided to \ +&struct drm_driver.dumb_create +* +* This function requires the driver to use @drm_device.vram_mm for its +* instance of VRAM MM. +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +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 , + false, args); +} +EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create); +/** * drm_gem_vram_driver_dumb_mmap_offset() - \ Implements &struct drm_driver.dumb_mmap_offset
drivers/gpu/drm/drm_vram_mm_helper.c +68 -0
71 lines not on this page · raw message
include/drm/drm_device.h +4 -0
@@ -17,6 +17,7 @@ struct drm_vblank_crtc;struct drm_sg_mem ;struct drm_local_map ;struct drm_vma_offset_manager ; +struct drm_vram_mm ;struct drm_fb_helper ;struct inode ;
@@ -286,6 +287,9 @@ struct drm_device {/** @vma_offset_manager: GEM information */ struct drm_vma_offset_manager *vma_offset_manager; +/** @vram_mm: VRAM MM memory manager */ +struct drm_vram_mm *vram_mm; +/** * @switch_power_state: *
include/drm/drm_gem_vram_helper.h +17 -1
@@ -11,6 +11,7 @@struct drm_mode_create_dumb ;struct drm_vram_mm_funcs ;struct filp ; +struct vm_area_struct ;#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM
@@ -115,9 +116,24 @@ extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs;*/ void drm_gem_vram_driver_gem_free_object_unlocked (struct drm_gem_object *gem); - +int drm_gem_vram_driver_dumb_create (struct drm_file *file, +struct drm_device *dev, +struct drm_mode_create_dumb *args);int drm_gem_vram_driver_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset); +/** +* define DRM_GEM_VRAM_DRIVER - default callback functions for \ +&struct drm_driver +* +* Drivers that use VRAM MM and GEM VRAM can use this macro to initialize +* &struct drm_driver with default functions. +*/ +#define DRM_GEM_VRAM_DRIVER \ + .gem_free_object_unlocked = \ + drm_gem_vram_driver_gem_free_object_unlocked, \ + .dumb_create = drm_gem_vram_driver_dumb_create, \ + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset +#endif
include/drm/drm_vram_mm_helper.h +32 -0
@@ -64,4 +64,36 @@ void drm_vram_mm_cleanup(struct drm_vram_mm *vmm);int drm_vram_mm_mmap (struct file *filp,struct vm_area_struct *vma,struct drm_vram_mm *vmm); +/* +* Helpers for integration with struct drm_device +*/ + +struct drm_vram_mm *drm_vram_helper_alloc_mm ( +struct drm_device *dev,u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs); +void drm_vram_helper_release_mm (struct drm_device *dev); + +/* +* Helpers for &struct file_operations +*/ + +int drm_vram_mm_file_operations_mmap ( +struct file *filp,struct vm_area_struct *vma); + +/** +* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \ +&struct file_operations +* +* Drivers that use VRAM MM can use this macro to initialize +* &struct file_operations with default functions. +*/ +#define DRM_VRAM_MM_FILE_OPERATIONS \ + .open = drm_open, \ + .release = drm_release, \ + .unlocked_ioctl = drm_ioctl, \ + .mmap = drm_vram_mm_file_operations_mmap, \ + .poll = drm_poll, \ + .compat_ioctl = drm_compat_ioctl, \ + .read = drm_read +#endif
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 8/19 drm/ast: Convert AST driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct ast_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/ast/Kconfig | 2 +- drivers/gpu/drm/ast/ast_drv.c | 4 +- drivers/gpu/drm/ast/ast_drv.h | 52 +--------- drivers/gpu/drm/ast/ast_fb.c | 18 ++-- drivers/gpu/drm/ast/ast_main.c | 74 ++------------ drivers/gpu/drm/ast/ast_mode.c | 78 +++++++++------ drivers/gpu/drm/ast/ast_ttm.c | 172 +-------------------------------- 7 files changed, 70 insertions(+), 330 deletions(-)
drivers/gpu/drm/ast/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_AST depends on DRM && PCI && MMU select DRM_TTM select DRM_KMS_HELPER - select DRM_TTM + select DRM_GEM_VRAM_HELPER help Say yes for experimental AST GPU driver. Do not enable this driver without having a working -modesetting,
drivers/gpu/drm/ast/ast_drv.c +2 -2
@@ -228,9 +228,9 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = ast_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = ast_dumb_create, - .dumb_map_offset = ast_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, };
drivers/gpu/drm/ast/ast_drv.h +1 -51
77 lines not on this page · raw message
drivers/gpu/drm/ast/ast_fb.c +9 -9
@@ -49,7 +49,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, {int i;struct drm_gem_object *obj; -struct ast_bo *bo; +struct drm_gem_vram_object *gbo;int src_offset, dst_offset;int bpp = afbdev->afb.base.format->cpp[0 ];int ret = -EBUSY ;
@@ -59,7 +59,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,unsigned long flags; obj = afbdev->afb.obj; - bo =gem_to_ast_bo (obj); + gbo =drm_gem_vram_of_gem (obj);/* * try and reserve the BO, if we fail with busy
@@ -67,7 +67,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,* store up the damage until later. */ if (drm_can_sleep ()) - ret =ast_bo_reserve (bo, true); + ret =drm_gem_vram_reserve (gbo, true);if (ret) {if (ret != -EBUSY )return ;
@@ -101,11 +101,11 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, afbdev->x2 = afbdev->y2 =0 ;spin_unlock_irqrestore (&afbdev->dirty_lock, flags); -if (!bo->kmap.virtual) { - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); +if (!gbo->kmap.virtual) { + ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap);if (ret) {DRM_ERROR ("failed to kmap fb updates\n" ); -ast_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo);return ; } unmap = true;
@@ -113,13 +113,13 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * afbdev->afb.base.pitches[0 ] + (x * bpp); -memcpy_toio (bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); +memcpy_toio (gbo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); }if (unmap) -ttm_bo_kunmap (&bo->kmap); +ttm_bo_kunmap (&gbo->kmap); -ast_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo); } static void ast_fillrect(struct fb_info *info,
drivers/gpu/drm/ast/ast_main.c +9 -65
95 lines not on this page · raw message
drivers/gpu/drm/ast/ast_mode.c +46 -32
164 lines not on this page · raw message
drivers/gpu/drm/ast/ast_ttm.c +2 -170
197 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 8/19 drm/ast: Convert AST driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct ast_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/ast/Kconfig | 2 +- drivers/gpu/drm/ast/ast_drv.c | 4 +- drivers/gpu/drm/ast/ast_drv.h | 52 +--------- drivers/gpu/drm/ast/ast_fb.c | 18 ++-- drivers/gpu/drm/ast/ast_main.c | 74 ++------------ drivers/gpu/drm/ast/ast_mode.c | 78 +++++++++------ drivers/gpu/drm/ast/ast_ttm.c | 172 +-------------------------------- 7 files changed, 70 insertions(+), 330 deletions(-)
drivers/gpu/drm/ast/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_AST depends on DRM && PCI && MMU select DRM_TTM select DRM_KMS_HELPER - select DRM_TTM + select DRM_GEM_VRAM_HELPER help Say yes for experimental AST GPU driver. Do not enable this driver without having a working -modesetting,
drivers/gpu/drm/ast/ast_drv.c +2 -2
@@ -228,9 +228,9 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = ast_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = ast_dumb_create, - .dumb_map_offset = ast_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, };
drivers/gpu/drm/ast/ast_drv.h +1 -51
77 lines not on this page · raw message
drivers/gpu/drm/ast/ast_fb.c +9 -9
@@ -49,7 +49,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, {int i;struct drm_gem_object *obj; -struct ast_bo *bo; +struct drm_gem_vram_object *gbo;int src_offset, dst_offset;int bpp = afbdev->afb.base.format->cpp[0 ];int ret = -EBUSY ;
@@ -59,7 +59,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,unsigned long flags; obj = afbdev->afb.obj; - bo =gem_to_ast_bo (obj); + gbo =drm_gem_vram_of_gem (obj);/* * try and reserve the BO, if we fail with busy
@@ -67,7 +67,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,* store up the damage until later. */ if (drm_can_sleep ()) - ret =ast_bo_reserve (bo, true); + ret =drm_gem_vram_reserve (gbo, true);if (ret) {if (ret != -EBUSY )return ;
@@ -101,11 +101,11 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, afbdev->x2 = afbdev->y2 =0 ;spin_unlock_irqrestore (&afbdev->dirty_lock, flags); -if (!bo->kmap.virtual) { - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); +if (!gbo->kmap.virtual) { + ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap);if (ret) {DRM_ERROR ("failed to kmap fb updates\n" ); -ast_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo);return ; } unmap = true;
@@ -113,13 +113,13 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * afbdev->afb.base.pitches[0 ] + (x * bpp); -memcpy_toio (bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); +memcpy_toio (gbo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); }if (unmap) -ttm_bo_kunmap (&bo->kmap); +ttm_bo_kunmap (&gbo->kmap); -ast_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo); } static void ast_fillrect(struct fb_info *info,
drivers/gpu/drm/ast/ast_main.c +9 -65
95 lines not on this page · raw message
drivers/gpu/drm/ast/ast_mode.c +46 -32
164 lines not on this page · raw message
drivers/gpu/drm/ast/ast_ttm.c +2 -170
197 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 9/19 drm/ast: Convert AST driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace ast's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement ast_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.c | 13 +--- drivers/gpu/drm/ast/ast_drv.h | 18 +---- drivers/gpu/drm/ast/ast_main.c | 13 +--- drivers/gpu/drm/ast/ast_ttm.c | 134 ++------------------------------- 5 files changed, 14 insertions(+), 165 deletions(-)
drivers/gpu/drm/ast/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_AST select DRM_TTM select DRM_KMS_HELPER select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Say yes for experimental AST GPU driver. Do not enable this driver without having a working -modesetting,
drivers/gpu/drm/ast/ast_drv.c +2 -11
@@ -205,13 +205,7 @@ static struct pci_driver ast_pci_driver = {static const struct file_operations ast_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .mmap = ast_mmap, - .poll = drm_poll, - .compat_ioctl = drm_compat_ioctl, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -228,10 +222,7 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = ast_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, - +DRM_GEM_VRAM_DRIVER };static int __init ast_init (void )
drivers/gpu/drm/ast/ast_drv.h +2 -16
@@ -31,15 +31,11 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> -#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_vram_mm_helper.h> +#include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
@@ -104,10 +100,6 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;/* Acces to this cache is protected by the crtc->mutex of the only crtc
@@ -325,10 +317,6 @@ void ast_fbdev_set_base(struct ast_private *ast, unsigned long gpu_addr);#define AST_MM_ALIGN_SHIFT 4#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1) -extern int ast_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -int ast_mm_init (struct ast_private *ast);void ast_mm_fini (struct ast_private *ast);
@@ -336,8 +324,6 @@ int ast_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj); -int ast_mmap (struct file *filp,struct vm_area_struct *vma); -/* ast post */ void ast_enable_vga (struct drm_device *dev);void ast_enable_mmio (struct drm_device *dev);
drivers/gpu/drm/ast/ast_main.c +1 -12
@@ -593,7 +593,6 @@ int ast_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj) { - struct ast_private *ast = dev->dev_private; struct drm_gem_vram_object *gbo;int ret;
@@ -603,7 +602,7 @@ int ast_gem_create(struct drm_device *dev,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &ast->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -613,13 +612,3 @@ int ast_gem_create(struct drm_device *dev, *obj = &gbo->gem;return 0 ; } - -int ast_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args) -{ -struct ast_private *ast = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , - false, args); -}
drivers/gpu/drm/ast/ast_ttm.c +8 -126
156 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 9/19 drm/ast: Convert AST driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace ast's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement ast_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.c | 13 +--- drivers/gpu/drm/ast/ast_drv.h | 18 +---- drivers/gpu/drm/ast/ast_main.c | 13 +--- drivers/gpu/drm/ast/ast_ttm.c | 134 ++------------------------------- 5 files changed, 14 insertions(+), 165 deletions(-)
drivers/gpu/drm/ast/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_AST select DRM_TTM select DRM_KMS_HELPER select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Say yes for experimental AST GPU driver. Do not enable this driver without having a working -modesetting,
drivers/gpu/drm/ast/ast_drv.c +2 -11
@@ -205,13 +205,7 @@ static struct pci_driver ast_pci_driver = {static const struct file_operations ast_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .mmap = ast_mmap, - .poll = drm_poll, - .compat_ioctl = drm_compat_ioctl, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -228,10 +222,7 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = ast_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, - +DRM_GEM_VRAM_DRIVER };static int __init ast_init (void )
drivers/gpu/drm/ast/ast_drv.h +2 -16
@@ -31,15 +31,11 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> -#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_vram_mm_helper.h> +#include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
@@ -104,10 +100,6 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;/* Acces to this cache is protected by the crtc->mutex of the only crtc
@@ -325,10 +317,6 @@ void ast_fbdev_set_base(struct ast_private *ast, unsigned long gpu_addr);#define AST_MM_ALIGN_SHIFT 4#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1) -extern int ast_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -int ast_mm_init (struct ast_private *ast);void ast_mm_fini (struct ast_private *ast);
@@ -336,8 +324,6 @@ int ast_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj); -int ast_mmap (struct file *filp,struct vm_area_struct *vma); -/* ast post */ void ast_enable_vga (struct drm_device *dev);void ast_enable_mmio (struct drm_device *dev);
drivers/gpu/drm/ast/ast_main.c +1 -12
@@ -593,7 +593,6 @@ int ast_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj) { - struct ast_private *ast = dev->dev_private; struct drm_gem_vram_object *gbo;int ret;
@@ -603,7 +602,7 @@ int ast_gem_create(struct drm_device *dev,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &ast->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -613,13 +612,3 @@ int ast_gem_create(struct drm_device *dev, *obj = &gbo->gem;return 0 ; } - -int ast_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args) -{ -struct ast_private *ast = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , - false, args); -}
drivers/gpu/drm/ast/ast_ttm.c +8 -126
156 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 10/19 drm/ast: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
In reply to Thomas ZimmermannThe AST driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent drm_gem_vram_kmap() functions. It removes the dependencies on TTM and cleans up the code.
--- drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_fb.c | 22 +++++++++----- drivers/gpu/drm/ast/ast_mode.c | 54 ++++++++++++++++++++++++---------- 3 files changed, 53 insertions(+), 24 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +0 -1
@@ -256,7 +256,6 @@ struct ast_fbdev {struct ast_framebuffer afb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };
drivers/gpu/drm/ast/ast_fb.c +14 -8
@@ -53,6 +53,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,int src_offset, dst_offset;int bpp = afbdev->afb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;
@@ -101,24 +102,29 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, afbdev->x2 = afbdev->y2 =0 ;spin_unlock_irqrestore (&afbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * afbdev->afb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }
drivers/gpu/drm/ast/ast_mode.c +39 -15
115 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 10/19 drm/ast: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
In reply to Thomas ZimmermannThe AST driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent drm_gem_vram_kmap() functions. It removes the dependencies on TTM and cleans up the code.
--- drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_fb.c | 22 +++++++++----- drivers/gpu/drm/ast/ast_mode.c | 54 ++++++++++++++++++++++++---------- 3 files changed, 53 insertions(+), 24 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +0 -1
@@ -256,7 +256,6 @@ struct ast_fbdev {struct ast_framebuffer afb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };
drivers/gpu/drm/ast/ast_fb.c +14 -8
@@ -53,6 +53,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,int src_offset, dst_offset;int bpp = afbdev->afb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;
@@ -101,24 +102,29 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, afbdev->x2 = afbdev->y2 =0 ;spin_unlock_irqrestore (&afbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * afbdev->afb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, afbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }
drivers/gpu/drm/ast/ast_mode.c +39 -15
115 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 11/19 drm/bochs: Convert bochs driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct bochs_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 34 +--- drivers/gpu/drm/bochs/bochs_drv.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 270 +++--------------------------- 5 files changed, 34 insertions(+), 293 deletions(-)
drivers/gpu/drm/bochs/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_BOCHS depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help Choose this option for qemu. If M is selected the module will be called bochs-drm.
drivers/gpu/drm/bochs/bochs.h +1 -33
@@ -10,6 +10,7 @@#include <drm/drm_simple_kms_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_page_alloc.h>
@@ -81,30 +82,6 @@ struct bochs_device { } ttm; }; -struct bochs_bo { -struct ttm_buffer_object bo; -struct ttm_placement placement; -struct ttm_bo_kmap_obj kmap; -struct drm_gem_object gem; -struct ttm_place placements[3 ]; -int pin_count; -}; - -static inline struct bochs_bo *bochs_bo (struct ttm_buffer_object *bo) -{ - return container_of(bo, struct bochs_bo, bo); -} - -static inline struct bochs_bo *gem_to_bochs_bo (struct drm_gem_object *gem) -{ - return container_of(gem, struct bochs_bo, gem); -} - -static inline u64 bochs_bo_mmap_offset (struct bochs_bo *bo) -{ -return drm_vma_node_offset_addr (&bo->bo.vma_node); -} -/* ---------------------------------------------------------------------- */ /* bochs_hw.c */
@@ -124,17 +101,8 @@ int bochs_mm_init(struct bochs_device *bochs);void bochs_mm_fini (struct bochs_device *bochs);int bochs_mmap (struct file *filp,struct vm_area_struct *vma); -int bochs_gem_create (struct drm_device *dev,u32 size,bool iskernel, -struct drm_gem_object **obj); -int bochs_gem_init_object (struct drm_gem_object *obj); -void bochs_gem_free_object (struct drm_gem_object *obj);int bochs_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int bochs_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev, -uint32_t handle,uint64_t *offset); - -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag); -int bochs_bo_unpin (struct bochs_bo *bo);int bochs_gem_prime_pin (struct drm_gem_object *obj);void bochs_gem_prime_unpin (struct drm_gem_object *obj);
drivers/gpu/drm/bochs/bochs_drv.c +2 -2
@@ -82,9 +82,9 @@ static struct drm_driver bochs_driver = { .date = "20130925", .major = 1, .minor = 0, - .gem_free_object_unlocked = bochs_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = bochs_dumb_create, - .dumb_map_offset = bochs_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import,
drivers/gpu/drm/bochs/bochs_kms.c +9 -9
@@ -30,16 +30,16 @@ static const uint32_t bochs_formats[] = {static void bochs_plane_update (struct bochs_device *bochs,struct drm_plane_state *state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!state->fb || !bochs->stride)return ; - bo =gem_to_bochs_bo (state->fb->obj[0 ]); + gbo =drm_gem_vram_of_gem (state->fb->obj[0 ]);bochs_hw_setbase (bochs, state->crtc_x, state->crtc_y, - bo->bo.offset); + gbo->bo.offset);bochs_hw_setformat (bochs, state->fb->format); }
@@ -72,23 +72,23 @@ static void bochs_pipe_update(struct drm_simple_display_pipe *pipe,static int bochs_pipe_prepare_fb (struct drm_simple_display_pipe *pipe,struct drm_plane_state *new_state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!new_state->fb)return 0 ; - bo =gem_to_bochs_bo (new_state->fb->obj[0 ]); -return bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); + gbo =drm_gem_vram_of_gem (new_state->fb->obj[0 ]); +return drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM ); }static void bochs_pipe_cleanup_fb (struct drm_simple_display_pipe *pipe,struct drm_plane_state *old_state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!old_state->fb)return ; - bo =gem_to_bochs_bo (old_state->fb->obj[0 ]); -bochs_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (old_state->fb->obj[0 ]); +drm_gem_vram_unpin (gbo); }static const struct drm_simple_display_pipe_funcs bochs_pipe_funcs = {
drivers/gpu/drm/bochs/bochs_mm.c +21 -249
343 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 11/19 drm/bochs: Convert bochs driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct bochs_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 34 +--- drivers/gpu/drm/bochs/bochs_drv.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 270 +++--------------------------- 5 files changed, 34 insertions(+), 293 deletions(-)
drivers/gpu/drm/bochs/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_BOCHS depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help Choose this option for qemu. If M is selected the module will be called bochs-drm.
drivers/gpu/drm/bochs/bochs.h +1 -33
@@ -10,6 +10,7 @@#include <drm/drm_simple_kms_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_page_alloc.h>
@@ -81,30 +82,6 @@ struct bochs_device { } ttm; }; -struct bochs_bo { -struct ttm_buffer_object bo; -struct ttm_placement placement; -struct ttm_bo_kmap_obj kmap; -struct drm_gem_object gem; -struct ttm_place placements[3 ]; -int pin_count; -}; - -static inline struct bochs_bo *bochs_bo (struct ttm_buffer_object *bo) -{ - return container_of(bo, struct bochs_bo, bo); -} - -static inline struct bochs_bo *gem_to_bochs_bo (struct drm_gem_object *gem) -{ - return container_of(gem, struct bochs_bo, gem); -} - -static inline u64 bochs_bo_mmap_offset (struct bochs_bo *bo) -{ -return drm_vma_node_offset_addr (&bo->bo.vma_node); -} -/* ---------------------------------------------------------------------- */ /* bochs_hw.c */
@@ -124,17 +101,8 @@ int bochs_mm_init(struct bochs_device *bochs);void bochs_mm_fini (struct bochs_device *bochs);int bochs_mmap (struct file *filp,struct vm_area_struct *vma); -int bochs_gem_create (struct drm_device *dev,u32 size,bool iskernel, -struct drm_gem_object **obj); -int bochs_gem_init_object (struct drm_gem_object *obj); -void bochs_gem_free_object (struct drm_gem_object *obj);int bochs_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int bochs_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev, -uint32_t handle,uint64_t *offset); - -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag); -int bochs_bo_unpin (struct bochs_bo *bo);int bochs_gem_prime_pin (struct drm_gem_object *obj);void bochs_gem_prime_unpin (struct drm_gem_object *obj);
drivers/gpu/drm/bochs/bochs_drv.c +2 -2
@@ -82,9 +82,9 @@ static struct drm_driver bochs_driver = { .date = "20130925", .major = 1, .minor = 0, - .gem_free_object_unlocked = bochs_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = bochs_dumb_create, - .dumb_map_offset = bochs_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import,
drivers/gpu/drm/bochs/bochs_kms.c +9 -9
@@ -30,16 +30,16 @@ static const uint32_t bochs_formats[] = {static void bochs_plane_update (struct bochs_device *bochs,struct drm_plane_state *state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!state->fb || !bochs->stride)return ; - bo =gem_to_bochs_bo (state->fb->obj[0 ]); + gbo =drm_gem_vram_of_gem (state->fb->obj[0 ]);bochs_hw_setbase (bochs, state->crtc_x, state->crtc_y, - bo->bo.offset); + gbo->bo.offset);bochs_hw_setformat (bochs, state->fb->format); }
@@ -72,23 +72,23 @@ static void bochs_pipe_update(struct drm_simple_display_pipe *pipe,static int bochs_pipe_prepare_fb (struct drm_simple_display_pipe *pipe,struct drm_plane_state *new_state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!new_state->fb)return 0 ; - bo =gem_to_bochs_bo (new_state->fb->obj[0 ]); -return bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); + gbo =drm_gem_vram_of_gem (new_state->fb->obj[0 ]); +return drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM ); }static void bochs_pipe_cleanup_fb (struct drm_simple_display_pipe *pipe,struct drm_plane_state *old_state) { -struct bochs_bo *bo; +struct drm_gem_vram_object *gbo;if (!old_state->fb)return ; - bo =gem_to_bochs_bo (old_state->fb->obj[0 ]); -bochs_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (old_state->fb->obj[0 ]); +drm_gem_vram_unpin (gbo); }static const struct drm_simple_display_pipe_funcs bochs_pipe_funcs = {
drivers/gpu/drm/bochs/bochs_mm.c +21 -249
343 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 12/19 drm/bochs: Convert bochs driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace bochs' TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement bochs_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 13 +-- drivers/gpu/drm/bochs/bochs_drv.c | 13 +-- drivers/gpu/drm/bochs/bochs_mm.c | 148 ++---------------------------- 4 files changed, 13 insertions(+), 162 deletions(-)
drivers/gpu/drm/bochs/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_BOCHS select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Choose this option for qemu. If M is selected the module will be called bochs-drm.
drivers/gpu/drm/bochs/bochs.h +1 -12
@@ -12,8 +12,7 @@#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_page_alloc.h> +#include <drm/drm_vram_mm_helper.h> /* ---------------------------------------------------------------------- */
@@ -74,12 +73,6 @@ struct bochs_device {struct drm_device *dev;struct drm_simple_display_pipe pipe;struct drm_connector connector; - -/* ttm */ -struct { -struct ttm_bo_device bdev; -bool initialized; - } ttm; };/* ---------------------------------------------------------------------- */
@@ -99,10 +92,6 @@ int bochs_hw_load_edid(struct bochs_device *bochs);/* bochs_mm.c */ int bochs_mm_init (struct bochs_device *bochs);void bochs_mm_fini (struct bochs_device *bochs); -int bochs_mmap (struct file *filp,struct vm_area_struct *vma); - -int bochs_dumb_create (struct drm_file *file,struct drm_device *dev, -struct drm_mode_create_dumb *args);int bochs_gem_prime_pin (struct drm_gem_object *obj);void bochs_gem_prime_unpin (struct drm_gem_object *obj);
drivers/gpu/drm/bochs/bochs_drv.c +3 -10
@@ -63,14 +63,8 @@ static int bochs_load(struct drm_device *dev)static const struct file_operations bochs_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .poll = drm_poll, - .read = drm_read, .llseek = no_llseek, - .mmap = bochs_mmap, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver bochs_driver = {
@@ -82,9 +76,8 @@ static struct drm_driver bochs_driver = { .date = "20130925", .major = 1, .minor =0 , - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = bochs_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, + +DRM_GEM_VRAM_DRIVER , .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import,
drivers/gpu/drm/bochs/bochs_mm.c +8 -140
165 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 12/19 drm/bochs: Convert bochs driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace bochs' TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement bochs_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 13 +-- drivers/gpu/drm/bochs/bochs_drv.c | 13 +-- drivers/gpu/drm/bochs/bochs_mm.c | 148 ++---------------------------- 4 files changed, 13 insertions(+), 162 deletions(-)
drivers/gpu/drm/bochs/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_BOCHS select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Choose this option for qemu. If M is selected the module will be called bochs-drm.
drivers/gpu/drm/bochs/bochs.h +1 -12
@@ -12,8 +12,7 @@#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_page_alloc.h> +#include <drm/drm_vram_mm_helper.h> /* ---------------------------------------------------------------------- */
@@ -74,12 +73,6 @@ struct bochs_device {struct drm_device *dev;struct drm_simple_display_pipe pipe;struct drm_connector connector; - -/* ttm */ -struct { -struct ttm_bo_device bdev; -bool initialized; - } ttm; };/* ---------------------------------------------------------------------- */
@@ -99,10 +92,6 @@ int bochs_hw_load_edid(struct bochs_device *bochs);/* bochs_mm.c */ int bochs_mm_init (struct bochs_device *bochs);void bochs_mm_fini (struct bochs_device *bochs); -int bochs_mmap (struct file *filp,struct vm_area_struct *vma); - -int bochs_dumb_create (struct drm_file *file,struct drm_device *dev, -struct drm_mode_create_dumb *args);int bochs_gem_prime_pin (struct drm_gem_object *obj);void bochs_gem_prime_unpin (struct drm_gem_object *obj);
drivers/gpu/drm/bochs/bochs_drv.c +3 -10
@@ -63,14 +63,8 @@ static int bochs_load(struct drm_device *dev)static const struct file_operations bochs_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .poll = drm_poll, - .read = drm_read, .llseek = no_llseek, - .mmap = bochs_mmap, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver bochs_driver = {
@@ -82,9 +76,8 @@ static struct drm_driver bochs_driver = { .date = "20130925", .major = 1, .minor =0 , - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = bochs_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, + +DRM_GEM_VRAM_DRIVER , .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import,
drivers/gpu/drm/bochs/bochs_mm.c +8 -140
165 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 13/19 drm/mgag200: Convert mgag200 driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct mgag200_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 63 +++++---- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 62 ++------ drivers/gpu/drm/mgag200/mgag200_fb.c | 18 +-- drivers/gpu/drm/mgag200/mgag200_main.c | 84 +++-------- drivers/gpu/drm/mgag200/mgag200_mode.c | 45 +++--- drivers/gpu/drm/mgag200/mgag200_ttm.c | 172 +---------------------- 8 files changed, 102 insertions(+), 347 deletions(-)
drivers/gpu/drm/mgag200/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_MGAG200 depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help This is a KMS driver for the MGA G200 server chips, it does not support the original MGA G200 or any of the desktop
drivers/gpu/drm/mgag200/mgag200_cursor.c +37 -26
138 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -2
@@ -80,9 +80,9 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = mgag200_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = mgag200_dumb_create, - .dumb_map_offset = mgag200_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, };static struct pci_driver mgag200_pci_driver = {
drivers/gpu/drm/mgag200/mgag200_drv.h +8 -54
101 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_fb.c +9 -9
@@ -23,7 +23,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, {int i;struct drm_gem_object *obj; -struct mgag200_bo *bo; +struct drm_gem_vram_object *gbo;int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ;
@@ -33,7 +33,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,unsigned long flags; obj = mfbdev->mfb.obj; - bo =gem_to_mga_bo (obj); + gbo =drm_gem_vram_of_gem (obj);/* * try and reserve the BO, if we fail with busy
@@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,* store up the damage until later. */ if (drm_can_sleep ()) - ret =mgag200_bo_reserve (bo, true); + ret =drm_gem_vram_reserve (gbo, true);if (ret) {if (ret != -EBUSY )return ;
@@ -75,11 +75,11 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!bo->kmap.virtual) { - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); +if (!gbo->kmap.virtual) { + ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap);if (ret) {DRM_ERROR ("failed to kmap fb updates\n" ); -mgag200_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo);return ; } unmap = true;
@@ -87,13 +87,13 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (bo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); +memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); }if (unmap) -ttm_bo_kunmap (&bo->kmap); +ttm_bo_kunmap (&gbo->kmap); -mgag200_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo); } static void mga_fillrect(struct fb_info *info,
drivers/gpu/drm/mgag200/mgag200_main.c +16 -68
111 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +27 -18
87 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_ttm.c +2 -170
197 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 13/19 drm/mgag200: Convert mgag200 driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct mgag200_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 63 +++++---- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 62 ++------ drivers/gpu/drm/mgag200/mgag200_fb.c | 18 +-- drivers/gpu/drm/mgag200/mgag200_main.c | 84 +++-------- drivers/gpu/drm/mgag200/mgag200_mode.c | 45 +++--- drivers/gpu/drm/mgag200/mgag200_ttm.c | 172 +---------------------- 8 files changed, 102 insertions(+), 347 deletions(-)
drivers/gpu/drm/mgag200/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_MGAG200 depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help This is a KMS driver for the MGA G200 server chips, it does not support the original MGA G200 or any of the desktop
drivers/gpu/drm/mgag200/mgag200_cursor.c +37 -26
138 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -2
@@ -80,9 +80,9 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = mgag200_gem_free_object, + .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = mgag200_dumb_create, - .dumb_map_offset = mgag200_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, };static struct pci_driver mgag200_pci_driver = {
drivers/gpu/drm/mgag200/mgag200_drv.h +8 -54
101 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_fb.c +9 -9
@@ -23,7 +23,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, {int i;struct drm_gem_object *obj; -struct mgag200_bo *bo; +struct drm_gem_vram_object *gbo;int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ;
@@ -33,7 +33,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,unsigned long flags; obj = mfbdev->mfb.obj; - bo =gem_to_mga_bo (obj); + gbo =drm_gem_vram_of_gem (obj);/* * try and reserve the BO, if we fail with busy
@@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,* store up the damage until later. */ if (drm_can_sleep ()) - ret =mgag200_bo_reserve (bo, true); + ret =drm_gem_vram_reserve (gbo, true);if (ret) {if (ret != -EBUSY )return ;
@@ -75,11 +75,11 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!bo->kmap.virtual) { - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); +if (!gbo->kmap.virtual) { + ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap);if (ret) {DRM_ERROR ("failed to kmap fb updates\n" ); -mgag200_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo);return ; } unmap = true;
@@ -87,13 +87,13 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (bo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); +memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); }if (unmap) -ttm_bo_kunmap (&bo->kmap); +ttm_bo_kunmap (&gbo->kmap); -mgag200_bo_unreserve (bo); +drm_gem_vram_unreserve (gbo); } static void mga_fillrect(struct fb_info *info,
drivers/gpu/drm/mgag200/mgag200_main.c +16 -68
111 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +27 -18
87 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_ttm.c +2 -170
197 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 14/19 drm/mgag200: Convert mgag200 driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace mgag200's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement mgag200_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +-- drivers/gpu/drm/mgag200/mgag200_drv.h | 11 +- drivers/gpu/drm/mgag200/mgag200_main.c | 17 +--- drivers/gpu/drm/mgag200/mgag200_ttm.c | 133 ++----------------------- 5 files changed, 16 insertions(+), 159 deletions(-)
drivers/gpu/drm/mgag200/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_MGAG200 select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help This is a KMS driver for the MGA G200 server chips, it does not support the original MGA G200 or any of the desktop
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -11
@@ -59,13 +59,7 @@ static void mga_pci_remove(struct pci_dev *pdev)static const struct file_operations mgag200_driver_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .mmap = mgag200_mmap, - .poll = drm_poll, - .compat_ioctl = drm_compat_ioctl, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -79,10 +73,7 @@ static struct drm_driver driver = { .major = DRIVER_MAJOR, .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = mgag200_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, + DRM_GEM_VRAM_DRIVER };static struct pci_driver mgag200_pci_driver = {
drivers/gpu/drm/mgag200/mgag200_drv.h +2 -9
@@ -17,15 +17,12 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_vram_mm_helper.h> +#include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
@@ -212,10 +209,6 @@ struct mga_device {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -/* SE model number stored in reg 0x1e24 */ u32 unique_rev_id; };
drivers/gpu/drm/mgag200/mgag200_main.c +3 -14
@@ -230,10 +230,10 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags) }/* Make small buffers to store a hardware cursor (double buffered icon updates) */ - mdev->cursor.pixels_1 =drm_gem_vram_create (dev, &mdev->ttm.bdev, + mdev->cursor.pixels_1 =drm_gem_vram_create (dev, &dev->vram_mm->bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 ); - mdev->cursor.pixels_2 =drm_gem_vram_create (dev, &mdev->ttm.bdev, + mdev->cursor.pixels_2 =drm_gem_vram_create (dev, &dev->vram_mm->bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 );if (IS_ERR (mdev->cursor.pixels_2) ||IS_ERR (mdev->cursor.pixels_1)) {
@@ -274,7 +274,6 @@ int mgag200_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj) { - struct mga_device *mdev = dev->dev_private; struct drm_gem_vram_object *gbo;int ret;
@@ -284,7 +283,7 @@ int mgag200_gem_create(struct drm_device *dev,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &mdev->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -294,13 +293,3 @@ int mgag200_gem_create(struct drm_device *dev, *obj = &gbo->gem;return 0 ; } - -int mgag200_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args) -{ -struct mga_device *mdev = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &mdev->ttm.bdev,0 , - false, args); -}
drivers/gpu/drm/mgag200/mgag200_ttm.c +8 -125
156 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 14/19 drm/mgag200: Convert mgag200 driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace mgag200's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement mgag200_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +-- drivers/gpu/drm/mgag200/mgag200_drv.h | 11 +- drivers/gpu/drm/mgag200/mgag200_main.c | 17 +--- drivers/gpu/drm/mgag200/mgag200_ttm.c | 133 ++----------------------- 5 files changed, 16 insertions(+), 159 deletions(-)
drivers/gpu/drm/mgag200/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_MGAG200 select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help This is a KMS driver for the MGA G200 server chips, it does not support the original MGA G200 or any of the desktop
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -11
@@ -59,13 +59,7 @@ static void mga_pci_remove(struct pci_dev *pdev)static const struct file_operations mgag200_driver_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .mmap = mgag200_mmap, - .poll = drm_poll, - .compat_ioctl = drm_compat_ioctl, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -79,10 +73,7 @@ static struct drm_driver driver = { .major = DRIVER_MAJOR, .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - - .gem_free_object_unlocked = drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = mgag200_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, + DRM_GEM_VRAM_DRIVER };static struct pci_driver mgag200_pci_driver = {
drivers/gpu/drm/mgag200/mgag200_drv.h +2 -9
@@ -17,15 +17,12 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_vram_mm_helper.h> +#include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
@@ -212,10 +209,6 @@ struct mga_device {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -/* SE model number stored in reg 0x1e24 */ u32 unique_rev_id; };
drivers/gpu/drm/mgag200/mgag200_main.c +3 -14
@@ -230,10 +230,10 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags) }/* Make small buffers to store a hardware cursor (double buffered icon updates) */ - mdev->cursor.pixels_1 =drm_gem_vram_create (dev, &mdev->ttm.bdev, + mdev->cursor.pixels_1 =drm_gem_vram_create (dev, &dev->vram_mm->bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 ); - mdev->cursor.pixels_2 =drm_gem_vram_create (dev, &mdev->ttm.bdev, + mdev->cursor.pixels_2 =drm_gem_vram_create (dev, &dev->vram_mm->bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 );if (IS_ERR (mdev->cursor.pixels_2) ||IS_ERR (mdev->cursor.pixels_1)) {
@@ -274,7 +274,6 @@ int mgag200_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj) { - struct mga_device *mdev = dev->dev_private; struct drm_gem_vram_object *gbo;int ret;
@@ -284,7 +283,7 @@ int mgag200_gem_create(struct drm_device *dev,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (dev, &mdev->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (dev, &dev->vram_mm->bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -294,13 +293,3 @@ int mgag200_gem_create(struct drm_device *dev, *obj = &gbo->gem;return 0 ; } - -int mgag200_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args) -{ -struct mga_device *mdev = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &mdev->ttm.bdev,0 , - false, args); -}
drivers/gpu/drm/mgag200/mgag200_ttm.c +8 -125
156 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 15/19 drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
In reply to Thomas ZimmermannThe mgag200 driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent drm_gem_vram_kmap() functions. It removes the dependencies on TTM and cleans up the code.
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 35 +++++++++++------------- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_fb.c | 22 +++++++++------ drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++-- 4 files changed, 36 insertions(+), 31 deletions(-)
drivers/gpu/drm/mgag200/mgag200_cursor.c +16 -19
@@ -43,6 +43,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,struct drm_gem_object *obj;struct drm_gem_vram_object *gbo =NULL ;int ret =0 ; +u8 *src, *dst;unsigned int i, row, col;uint32_t colour_set[16 ];uint32_t *next_space = &colour_set[0 ];
@@ -126,18 +127,17 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,dev_err (&dev->pdev->dev,"failed to reserve user bo\n" ); goto out1; } -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); - goto out2; - } + src =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (src)) { + ret =PTR_ERR (src); +dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); + goto out2; }memset (&colour_set[0 ],0 ,sizeof (uint32_t )*16 );/* width*height*4 = 16384 */ for (i =0 ; i <16384 ; i +=4 ) { - this_colour =ioread32 (gbo->kmap.virtual + i); + this_colour =ioread32 (src + i);/* No transparency */ if (this_colour>>24 !=0xff && this_colour>>24 !=0x0 ) {
@@ -189,21 +189,18 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, }/* Map up-coming buffer to write colour indices */ -if (!pixels_prev->kmap.virtual) { - ret =ttm_bo_kmap (&pixels_prev->bo,0 , - pixels_prev->bo.num_pages, - &pixels_prev->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); - goto out3; - } + dst =drm_gem_vram_kmap (pixels_prev, true,NULL ); +if (IS_ERR (dst)) { + ret =PTR_ERR (dst); +dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); + goto out3; }/* now write colour indices into hardware cursor buffer */ for (row =0 ; row <64 ; row++) {memset (&this_row[0 ],0 ,48 );for (col =0 ; col <64 ; col++) { - this_colour =ioread32 (gbo->kmap.virtual +4 *(col +64 *row)); + this_colour =ioread32 (src +4 *(col +64 *row));/* write transparent pixels */ if (this_colour>>24 ==0x0 ) { this_row[47 - col/8 ] |=0x80 >>(col%8 );
@@ -221,7 +218,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } } } -memcpy_toio (pixels_prev->kmap.virtual + row*48 , &this_row[0 ],48 ); +memcpy_toio (dst + row*48 , &this_row[0 ],48 ); }/* Program gpu address of cursor buffer */
@@ -247,9 +244,9 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } ret =0 ; -ttm_bo_kunmap (&pixels_prev->kmap); +drm_gem_vram_kunmap (pixels_prev); out3: -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); out2:drm_gem_vram_unreserve (gbo); out1:
drivers/gpu/drm/mgag200/mgag200_drv.h +0 -1
@@ -115,7 +115,6 @@ struct mga_fbdev {struct mga_framebuffer mfb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };
drivers/gpu/drm/mgag200/mgag200_fb.c +14 -8
@@ -27,6 +27,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;
@@ -75,24 +76,29 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }
drivers/gpu/drm/mgag200/mgag200_mode.c +6 -3
@@ -870,6 +870,7 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,struct drm_gem_vram_object *gbo;int ret;s64 gpu_addr; +void * base;/* push the previous fb to system ram */ if (!atomic && fb) {
@@ -902,11 +903,13 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,if (&mdev->mfbdev->mfb == mga_fb) {/* if pushing console in kmap it */ - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon\n" ); - + } } +drm_gem_vram_unreserve (gbo);mga_set_start_address (crtc, (u32 )gpu_addr);
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 15/19 drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
In reply to Thomas ZimmermannThe mgag200 driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent drm_gem_vram_kmap() functions. It removes the dependencies on TTM and cleans up the code.
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 35 +++++++++++------------- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_fb.c | 22 +++++++++------ drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++-- 4 files changed, 36 insertions(+), 31 deletions(-)
drivers/gpu/drm/mgag200/mgag200_cursor.c +16 -19
@@ -43,6 +43,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,struct drm_gem_object *obj;struct drm_gem_vram_object *gbo =NULL ;int ret =0 ; +u8 *src, *dst;unsigned int i, row, col;uint32_t colour_set[16 ];uint32_t *next_space = &colour_set[0 ];
@@ -126,18 +127,17 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,dev_err (&dev->pdev->dev,"failed to reserve user bo\n" ); goto out1; } -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); - goto out2; - } + src =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (src)) { + ret =PTR_ERR (src); +dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); + goto out2; }memset (&colour_set[0 ],0 ,sizeof (uint32_t )*16 );/* width*height*4 = 16384 */ for (i =0 ; i <16384 ; i +=4 ) { - this_colour =ioread32 (gbo->kmap.virtual + i); + this_colour =ioread32 (src + i);/* No transparency */ if (this_colour>>24 !=0xff && this_colour>>24 !=0x0 ) {
@@ -189,21 +189,18 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, }/* Map up-coming buffer to write colour indices */ -if (!pixels_prev->kmap.virtual) { - ret =ttm_bo_kmap (&pixels_prev->bo,0 , - pixels_prev->bo.num_pages, - &pixels_prev->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); - goto out3; - } + dst =drm_gem_vram_kmap (pixels_prev, true,NULL ); +if (IS_ERR (dst)) { + ret =PTR_ERR (dst); +dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); + goto out3; }/* now write colour indices into hardware cursor buffer */ for (row =0 ; row <64 ; row++) {memset (&this_row[0 ],0 ,48 );for (col =0 ; col <64 ; col++) { - this_colour =ioread32 (gbo->kmap.virtual +4 *(col +64 *row)); + this_colour =ioread32 (src +4 *(col +64 *row));/* write transparent pixels */ if (this_colour>>24 ==0x0 ) { this_row[47 - col/8 ] |=0x80 >>(col%8 );
@@ -221,7 +218,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } } } -memcpy_toio (pixels_prev->kmap.virtual + row*48 , &this_row[0 ],48 ); +memcpy_toio (dst + row*48 , &this_row[0 ],48 ); }/* Program gpu address of cursor buffer */
@@ -247,9 +244,9 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } ret =0 ; -ttm_bo_kunmap (&pixels_prev->kmap); +drm_gem_vram_kunmap (pixels_prev); out3: -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); out2:drm_gem_vram_unreserve (gbo); out1:
drivers/gpu/drm/mgag200/mgag200_drv.h +0 -1
@@ -115,7 +115,6 @@ struct mga_fbdev {struct mga_framebuffer mfb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };
drivers/gpu/drm/mgag200/mgag200_fb.c +14 -8
@@ -27,6 +27,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;
@@ -75,24 +76,29 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }
drivers/gpu/drm/mgag200/mgag200_mode.c +6 -3
@@ -870,6 +870,7 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,struct drm_gem_vram_object *gbo;int ret;s64 gpu_addr; +void * base;/* push the previous fb to system ram */ if (!atomic && fb) {
@@ -902,11 +903,13 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,if (&mdev->mfbdev->mfb == mga_fb) {/* if pushing console in kmap it */ - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon\n" ); - + } } +drm_gem_vram_unreserve (gbo);mga_set_start_address (crtc, (u32 )gpu_addr);
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 15/19] drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
Quoted 4 lines · Thomas Zimmermann
The mgag200 driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent
drm_gem_vram_kmap()functions. It removes the dependencies on TTM and cleans up the code.
s-o-b missing here.
-Daniel
Quoted 187 lines
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 35 +++++++++++------------- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_fb.c | 22 +++++++++------ drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++-- 4 files changed, 36 insertions(+), 31 deletions(-)drivers/gpu/drm/mgag200/mgag200_cursor.c +16
-19@@ -43,6 +43,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,struct drm_gem_object *obj;struct drm_gem_vram_object *gbo =NULL ;int ret =0 ; +u8 *src, *dst;unsigned int i, row, col;uint32_t colour_set[16 ];uint32_t *next_space = &colour_set[0 ];@@ -126,18 +127,17 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,dev_err (&dev->pdev->dev,"failed to reserve user bo\n" ); goto out1; } -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); - goto out2; - } + src =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (src)) { + ret =PTR_ERR (src); +dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); + goto out2; }memset (&colour_set[0 ],0 ,sizeof (uint32_t )*16 );/* width*height*4 = 16384 */ for (i =0 ; i <16384 ; i +=4 ) { - this_colour =ioread32 (gbo->kmap.virtual + i); + this_colour =ioread32 (src + i);/* No transparency */ if (this_colour>>24 !=0xff && this_colour>>24 !=0x0 ) {@@ -189,21 +189,18 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, }/* Map up-coming buffer to write colour indices */ -if (!pixels_prev->kmap.virtual) { - ret =ttm_bo_kmap (&pixels_prev->bo,0 , - pixels_prev->bo.num_pages, - &pixels_prev->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); - goto out3; - } + dst =drm_gem_vram_kmap (pixels_prev, true,NULL ); +if (IS_ERR (dst)) { + ret =PTR_ERR (dst); +dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); + goto out3; }/* now write colour indices into hardware cursor buffer */ for (row =0 ; row <64 ; row++) {memset (&this_row[0 ],0 ,48 );for (col =0 ; col <64 ; col++) { - this_colour =ioread32 (gbo->kmap.virtual +4 *(col +64 *row)); + this_colour =ioread32 (src +4 *(col +64 *row));/* write transparent pixels */ if (this_colour>>24 ==0x0 ) { this_row[47 - col/8 ] |=0x80 >>(col%8 );@@ -221,7 +218,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } } } -memcpy_toio (pixels_prev->kmap.virtual + row*48 , &this_row[0 ],48 ); +memcpy_toio (dst + row*48 , &this_row[0 ],48 ); }/* Program gpu address of cursor buffer */ @@ -247,9 +244,9 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } ret =0 ; -ttm_bo_kunmap (&pixels_prev->kmap); +drm_gem_vram_kunmap (pixels_prev); out3: -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); out2:drm_gem_vram_unreserve (gbo); out1:drivers/gpu/drm/mgag200/mgag200_drv.h +0
-1@@ -115,7 +115,6 @@ struct mga_fbdev {struct mga_framebuffer mfb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };drivers/gpu/drm/mgag200/mgag200_fb.c +14
-8@@ -27,6 +27,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;@@ -75,24 +76,29 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }drivers/gpu/drm/mgag200/mgag200_mode.c +6
-3@@ -870,6 +870,7 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,struct drm_gem_vram_object *gbo;int ret;s64 gpu_addr; +void * base;/* push the previous fb to system ram */ if (!atomic && fb) {@@ -902,11 +903,13 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,if (&mdev->mfbdev->mfb == mga_fb) {/* if pushing console in kmap it */ - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon\n" ); - + } } +drm_gem_vram_unreserve (gbo);mga_set_start_address (crtc, (u32 )gpu_addr);Signature · 1 line
2.21.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH v3 15/19] drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
In reply to Thomas ZimmermannQuoted 4 lines · Thomas Zimmermann
The mgag200 driver establishes several memory mappings for frame buffers and cursors. This patch converts the driver to use the equivalent
drm_gem_vram_kmap()functions. It removes the dependencies on TTM and cleans up the code.
s-o-b missing here.
-Daniel
Quoted 187 lines
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 35 +++++++++++------------- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_fb.c | 22 +++++++++------ drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++-- 4 files changed, 36 insertions(+), 31 deletions(-)drivers/gpu/drm/mgag200/mgag200_cursor.c +16
-19@@ -43,6 +43,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,struct drm_gem_object *obj;struct drm_gem_vram_object *gbo =NULL ;int ret =0 ; +u8 *src, *dst;unsigned int i, row, col;uint32_t colour_set[16 ];uint32_t *next_space = &colour_set[0 ];@@ -126,18 +127,17 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,dev_err (&dev->pdev->dev,"failed to reserve user bo\n" ); goto out1; } -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); - goto out2; - } + src =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (src)) { + ret =PTR_ERR (src); +dev_err (&dev->pdev->dev,"failed to kmap user buffer updates\n" ); + goto out2; }memset (&colour_set[0 ],0 ,sizeof (uint32_t )*16 );/* width*height*4 = 16384 */ for (i =0 ; i <16384 ; i +=4 ) { - this_colour =ioread32 (gbo->kmap.virtual + i); + this_colour =ioread32 (src + i);/* No transparency */ if (this_colour>>24 !=0xff && this_colour>>24 !=0x0 ) {@@ -189,21 +189,18 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, }/* Map up-coming buffer to write colour indices */ -if (!pixels_prev->kmap.virtual) { - ret =ttm_bo_kmap (&pixels_prev->bo,0 , - pixels_prev->bo.num_pages, - &pixels_prev->kmap); -if (ret) { -dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); - goto out3; - } + dst =drm_gem_vram_kmap (pixels_prev, true,NULL ); +if (IS_ERR (dst)) { + ret =PTR_ERR (dst); +dev_err (&dev->pdev->dev,"failed to kmap cursor updates\n" ); + goto out3; }/* now write colour indices into hardware cursor buffer */ for (row =0 ; row <64 ; row++) {memset (&this_row[0 ],0 ,48 );for (col =0 ; col <64 ; col++) { - this_colour =ioread32 (gbo->kmap.virtual +4 *(col +64 *row)); + this_colour =ioread32 (src +4 *(col +64 *row));/* write transparent pixels */ if (this_colour>>24 ==0x0 ) { this_row[47 - col/8 ] |=0x80 >>(col%8 );@@ -221,7 +218,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } } } -memcpy_toio (pixels_prev->kmap.virtual + row*48 , &this_row[0 ],48 ); +memcpy_toio (dst + row*48 , &this_row[0 ],48 ); }/* Program gpu address of cursor buffer */ @@ -247,9 +244,9 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, } ret =0 ; -ttm_bo_kunmap (&pixels_prev->kmap); +drm_gem_vram_kunmap (pixels_prev); out3: -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); out2:drm_gem_vram_unreserve (gbo); out1:drivers/gpu/drm/mgag200/mgag200_drv.h +0
-1@@ -115,7 +115,6 @@ struct mga_fbdev {struct mga_framebuffer mfb;void *sysram;int size; -struct ttm_bo_kmap_obj mapping;int x1, y1, x2, y2;/* dirty rect */ spinlock_t dirty_lock; };drivers/gpu/drm/mgag200/mgag200_fb.c +14
-8@@ -27,6 +27,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,int src_offset, dst_offset;int bpp = mfbdev->mfb.base.format->cpp[0 ];int ret = -EBUSY ; +u8 *dst;bool unmap = false;bool store_for_later = false;int x2, y2;@@ -75,24 +76,29 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, mfbdev->x2 = mfbdev->y2 =0 ;spin_unlock_irqrestore (&mfbdev->dirty_lock, flags); -if (!gbo->kmap.virtual) { - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) { + dst =drm_gem_vram_kmap (gbo, false,NULL ); +if (IS_ERR (dst)) { +DRM_ERROR ("failed to kmap fb updates\n" ); + goto out; + }else if (!dst) { + dst =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (dst)) {DRM_ERROR ("failed to kmap fb updates\n" ); -drm_gem_vram_unreserve (gbo); -return ; + goto out; } unmap = true; } +for (i = y; i <= y2; i++) {/* assume equal stride for now */ src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0 ] + (x * bpp); -memcpy_toio (gbo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); - +memcpy_toio (dst + dst_offset, mfbdev->sysram + src_offset, (x2 - x +1 ) * bpp); } +if (unmap) -ttm_bo_kunmap (&gbo->kmap); +drm_gem_vram_kunmap (gbo); +out:drm_gem_vram_unreserve (gbo); }drivers/gpu/drm/mgag200/mgag200_mode.c +6
-3@@ -870,6 +870,7 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,struct drm_gem_vram_object *gbo;int ret;s64 gpu_addr; +void * base;/* push the previous fb to system ram */ if (!atomic && fb) {@@ -902,11 +903,13 @@ static int mga_crtc_do_set_base(struct drm_crtc *crtc,if (&mdev->mfbdev->mfb == mga_fb) {/* if pushing console in kmap it */ - ret =ttm_bo_kmap (&gbo->bo,0 , gbo->bo.num_pages, &gbo->kmap); -if (ret) + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon\n" ); - + } } +drm_gem_vram_unreserve (gbo);mga_set_start_address (crtc, (u32 )gpu_addr);Signature · 1 line
2.21.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
maintainerPATCH v3 16/19 drm/vboxvideo: Convert vboxvideo driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThis patch replaces |struct vbox_bo| and its helpers with the generic implementation of |struct drm_gem_vram_object|. The only change in semantics is that &ttm_bo_driver.verify_access() now does the actual verification.
v3:
* remove forward declaration of struct vbox_gem_object
v2:
nothing
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 60 +------ drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +-- drivers/gpu/drm/vboxvideo/vbox_main.c | 70 +------- drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +++-- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 223 +------------------------- 7 files changed, 45 insertions(+), 372 deletions(-)
drivers/gpu/drm/vboxvideo/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_VBOXVIDEO depends on DRM && X86 && PCI select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER select GENERIC_ALLOCATOR help This is a KMS driver for the virtual Graphics Card used in
drivers/gpu/drm/vboxvideo/vbox_drv.c +3 -2
@@ -215,9 +215,10 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = vbox_gem_free_object, + .gem_free_object_unlocked = + drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = vbox_dumb_create, - .dumb_map_offset = vbox_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export,
drivers/gpu/drm/vboxvideo/vbox_drv.h +1 -59
88 lines not on this page · raw message
drivers/gpu/drm/vboxvideo/vbox_fb.c +11 -11
@@ -51,9 +51,9 @@ int vboxfb_create(struct drm_fb_helper *helper,struct drm_framebuffer *fb;struct fb_info *info;struct drm_gem_object *gobj; -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;int size, ret; -u64 gpu_addr; +s64 gpu_addr;u32 pitch; mode_cmd.width = sizes->surface_width;
@@ -75,9 +75,9 @@ int vboxfb_create(struct drm_fb_helper *helper,if (ret)return ret; - bo =gem_to_vbox_bo (gobj); + gbo =drm_gem_vram_of_gem (gobj); - ret =vbox_bo_pin (bo,TTM_PL_FLAG_VRAM ); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret)return ret;
@@ -86,7 +86,7 @@ int vboxfb_create(struct drm_fb_helper *helper,return PTR_ERR (info); info->screen_size = size; - info->screen_base = (char __iomem *)vbox_bo_kmap (bo); + info->screen_base = (char __iomem *)drm_gem_vram_kmap (gbo, true,NULL );if (IS_ERR (info->screen_base))return PTR_ERR (info->screen_base);
@@ -104,7 +104,9 @@ int vboxfb_create(struct drm_fb_helper *helper,drm_fb_helper_fill_info (info, helper, sizes); - gpu_addr =vbox_bo_gpu_offset (bo); + gpu_addr =drm_gem_vram_offset (gbo); +if (gpu_addr <0 ) +return (int )gpu_addr; info->fix.smem_start = info->apertures->ranges[0 ].base + gpu_addr; info->fix.smem_len = vbox->available_vram_size - gpu_addr;
@@ -132,12 +134,10 @@ void vbox_fbdev_fini(struct vbox_private *vbox)drm_fb_helper_unregister_fbi (&vbox->fb_helper);if (afb->obj) { -struct vbox_bo *bo =gem_to_vbox_bo (afb->obj); +struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (afb->obj); -vbox_bo_kunmap (bo); - -if (bo->pin_count) -vbox_bo_unpin (bo); +drm_gem_vram_kunmap (gbo); +drm_gem_vram_unpin (gbo);drm_gem_object_put_unlocked (afb->obj); afb->obj =NULL ;
drivers/gpu/drm/vboxvideo/vbox_main.c +8 -62
93 lines not on this page · raw message
drivers/gpu/drm/vboxvideo/vbox_mode.c +19 -17
@@ -173,7 +173,8 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,struct drm_framebuffer *fb, int x, int y) { - struct vbox_bo *bo = gem_to_vbox_bo(to_vbox_framebuffer(fb)->obj); + struct drm_gem_vram_object *gbo = +drm_gem_vram_of_gem (to_vbox_framebuffer (fb)->obj);struct vbox_private *vbox = crtc->dev->dev_private;struct vbox_crtc *vbox_crtc =to_vbox_crtc (crtc);bool needs_modeset =drm_atomic_crtc_needs_modeset (crtc->state);
@@ -187,7 +188,7 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, vbox_crtc->x = x; vbox_crtc->y = y; - vbox_crtc->fb_offset =vbox_bo_gpu_offset (bo); + vbox_crtc->fb_offset =drm_gem_vram_offset (gbo);/* vbox_do_modeset() checks vbox->single_framebuffer so update it now */ if (needs_modeset &&vbox_set_up_input_mapping (vbox)) {
@@ -303,14 +304,14 @@ static void vbox_primary_atomic_disable(struct drm_plane *plane,static int vbox_primary_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;int ret;if (!new_state->fb)return 0 ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (new_state->fb)->obj); - ret =vbox_bo_pin (bo,TTM_PL_FLAG_VRAM ); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (new_state->fb)->obj); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret)DRM_WARN ("Error %d pinning new fb, out of video mem?\n" , ret);
@@ -320,13 +321,13 @@ static int vbox_primary_prepare_fb(struct drm_plane *plane,static void vbox_primary_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!old_state->fb)return ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (old_state->fb)->obj); -vbox_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (old_state->fb)->obj); +drm_gem_vram_unpin (gbo); } static int vbox_cursor_atomic_check(struct drm_plane *plane,
@@ -386,7 +387,8 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, container_of(plane->dev, struct vbox_private, ddev);struct vbox_crtc *vbox_crtc =to_vbox_crtc (plane->state->crtc);struct drm_framebuffer *fb = plane->state->fb; -struct vbox_bo *bo =gem_to_vbox_bo (to_vbox_framebuffer (fb)->obj); +struct drm_gem_vram_object *gbo = +drm_gem_vram_of_gem (to_vbox_framebuffer (fb)->obj);u32 width = plane->state->crtc_w;u32 height = plane->state->crtc_h;size_t data_size, mask_size;
@@ -405,7 +407,7 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, vbox_crtc->cursor_enabled = true;/* pinning is done in prepare/cleanup framebuffer */ - src =vbox_bo_kmap (bo); + src =drm_gem_vram_kmap (gbo, true,NULL );if (IS_ERR (src)) {mutex_unlock (&vbox->hw_mutex);DRM_WARN ("Could not kmap cursor bo, skipping update\n" );
@@ -421,7 +423,7 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, data_size = width * height *4 + mask_size;copy_cursor_image (src, vbox->cursor_data, width, height, mask_size); -vbox_bo_kunmap (bo); +drm_gem_vram_kunmap (gbo); flags =VBOX_MOUSE_POINTER_VISIBLE |VBOX_MOUSE_POINTER_SHAPE |VBOX_MOUSE_POINTER_ALPHA ;
@@ -461,25 +463,25 @@ static void vbox_cursor_atomic_disable(struct drm_plane *plane,static int vbox_cursor_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!new_state->fb)return 0 ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (new_state->fb)->obj); -return vbox_bo_pin (bo,TTM_PL_FLAG_SYSTEM ); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (new_state->fb)->obj); +return drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_SYSTEM ); }static void vbox_cursor_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!plane->state->fb)return ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (plane->state->fb)->obj); -vbox_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (plane->state->fb)->obj); +drm_gem_vram_unpin (gbo); }static const u32 vbox_cursor_plane_formats[] = {
drivers/gpu/drm/vboxvideo/vbox_ttm.c +2 -221
250 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 16/19 drm/vboxvideo: Convert vboxvideo driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThis patch replaces |struct vbox_bo| and its helpers with the generic implementation of |struct drm_gem_vram_object|. The only change in semantics is that &ttm_bo_driver.verify_access() now does the actual verification.
v3:
* remove forward declaration of struct vbox_gem_object
v2:
nothing
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 60 +------ drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +-- drivers/gpu/drm/vboxvideo/vbox_main.c | 70 +------- drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +++-- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 223 +------------------------- 7 files changed, 45 insertions(+), 372 deletions(-)
drivers/gpu/drm/vboxvideo/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_VBOXVIDEO depends on DRM && X86 && PCI select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER select GENERIC_ALLOCATOR help This is a KMS driver for the virtual Graphics Card used in
drivers/gpu/drm/vboxvideo/vbox_drv.c +3 -2
@@ -215,9 +215,10 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object_unlocked = vbox_gem_free_object, + .gem_free_object_unlocked = + drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = vbox_dumb_create, - .dumb_map_offset = vbox_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export,
drivers/gpu/drm/vboxvideo/vbox_drv.h +1 -59
88 lines not on this page · raw message
drivers/gpu/drm/vboxvideo/vbox_fb.c +11 -11
@@ -51,9 +51,9 @@ int vboxfb_create(struct drm_fb_helper *helper,struct drm_framebuffer *fb;struct fb_info *info;struct drm_gem_object *gobj; -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;int size, ret; -u64 gpu_addr; +s64 gpu_addr;u32 pitch; mode_cmd.width = sizes->surface_width;
@@ -75,9 +75,9 @@ int vboxfb_create(struct drm_fb_helper *helper,if (ret)return ret; - bo =gem_to_vbox_bo (gobj); + gbo =drm_gem_vram_of_gem (gobj); - ret =vbox_bo_pin (bo,TTM_PL_FLAG_VRAM ); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret)return ret;
@@ -86,7 +86,7 @@ int vboxfb_create(struct drm_fb_helper *helper,return PTR_ERR (info); info->screen_size = size; - info->screen_base = (char __iomem *)vbox_bo_kmap (bo); + info->screen_base = (char __iomem *)drm_gem_vram_kmap (gbo, true,NULL );if (IS_ERR (info->screen_base))return PTR_ERR (info->screen_base);
@@ -104,7 +104,9 @@ int vboxfb_create(struct drm_fb_helper *helper,drm_fb_helper_fill_info (info, helper, sizes); - gpu_addr =vbox_bo_gpu_offset (bo); + gpu_addr =drm_gem_vram_offset (gbo); +if (gpu_addr <0 ) +return (int )gpu_addr; info->fix.smem_start = info->apertures->ranges[0 ].base + gpu_addr; info->fix.smem_len = vbox->available_vram_size - gpu_addr;
@@ -132,12 +134,10 @@ void vbox_fbdev_fini(struct vbox_private *vbox)drm_fb_helper_unregister_fbi (&vbox->fb_helper);if (afb->obj) { -struct vbox_bo *bo =gem_to_vbox_bo (afb->obj); +struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (afb->obj); -vbox_bo_kunmap (bo); - -if (bo->pin_count) -vbox_bo_unpin (bo); +drm_gem_vram_kunmap (gbo); +drm_gem_vram_unpin (gbo);drm_gem_object_put_unlocked (afb->obj); afb->obj =NULL ;
drivers/gpu/drm/vboxvideo/vbox_main.c +8 -62
93 lines not on this page · raw message
drivers/gpu/drm/vboxvideo/vbox_mode.c +19 -17
@@ -173,7 +173,8 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,struct drm_framebuffer *fb, int x, int y) { - struct vbox_bo *bo = gem_to_vbox_bo(to_vbox_framebuffer(fb)->obj); + struct drm_gem_vram_object *gbo = +drm_gem_vram_of_gem (to_vbox_framebuffer (fb)->obj);struct vbox_private *vbox = crtc->dev->dev_private;struct vbox_crtc *vbox_crtc =to_vbox_crtc (crtc);bool needs_modeset =drm_atomic_crtc_needs_modeset (crtc->state);
@@ -187,7 +188,7 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, vbox_crtc->x = x; vbox_crtc->y = y; - vbox_crtc->fb_offset =vbox_bo_gpu_offset (bo); + vbox_crtc->fb_offset =drm_gem_vram_offset (gbo);/* vbox_do_modeset() checks vbox->single_framebuffer so update it now */ if (needs_modeset &&vbox_set_up_input_mapping (vbox)) {
@@ -303,14 +304,14 @@ static void vbox_primary_atomic_disable(struct drm_plane *plane,static int vbox_primary_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;int ret;if (!new_state->fb)return 0 ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (new_state->fb)->obj); - ret =vbox_bo_pin (bo,TTM_PL_FLAG_VRAM ); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (new_state->fb)->obj); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret)DRM_WARN ("Error %d pinning new fb, out of video mem?\n" , ret);
@@ -320,13 +321,13 @@ static int vbox_primary_prepare_fb(struct drm_plane *plane,static void vbox_primary_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!old_state->fb)return ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (old_state->fb)->obj); -vbox_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (old_state->fb)->obj); +drm_gem_vram_unpin (gbo); } static int vbox_cursor_atomic_check(struct drm_plane *plane,
@@ -386,7 +387,8 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, container_of(plane->dev, struct vbox_private, ddev);struct vbox_crtc *vbox_crtc =to_vbox_crtc (plane->state->crtc);struct drm_framebuffer *fb = plane->state->fb; -struct vbox_bo *bo =gem_to_vbox_bo (to_vbox_framebuffer (fb)->obj); +struct drm_gem_vram_object *gbo = +drm_gem_vram_of_gem (to_vbox_framebuffer (fb)->obj);u32 width = plane->state->crtc_w;u32 height = plane->state->crtc_h;size_t data_size, mask_size;
@@ -405,7 +407,7 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, vbox_crtc->cursor_enabled = true;/* pinning is done in prepare/cleanup framebuffer */ - src =vbox_bo_kmap (bo); + src =drm_gem_vram_kmap (gbo, true,NULL );if (IS_ERR (src)) {mutex_unlock (&vbox->hw_mutex);DRM_WARN ("Could not kmap cursor bo, skipping update\n" );
@@ -421,7 +423,7 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, data_size = width * height *4 + mask_size;copy_cursor_image (src, vbox->cursor_data, width, height, mask_size); -vbox_bo_kunmap (bo); +drm_gem_vram_kunmap (gbo); flags =VBOX_MOUSE_POINTER_VISIBLE |VBOX_MOUSE_POINTER_SHAPE |VBOX_MOUSE_POINTER_ALPHA ;
@@ -461,25 +463,25 @@ static void vbox_cursor_atomic_disable(struct drm_plane *plane,static int vbox_cursor_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!new_state->fb)return 0 ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (new_state->fb)->obj); -return vbox_bo_pin (bo,TTM_PL_FLAG_SYSTEM ); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (new_state->fb)->obj); +return drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_SYSTEM ); }static void vbox_cursor_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct vbox_bo *bo; +struct drm_gem_vram_object *gbo;if (!plane->state->fb)return ; - bo =gem_to_vbox_bo (to_vbox_framebuffer (plane->state->fb)->obj); -vbox_bo_unpin (bo); + gbo =drm_gem_vram_of_gem (to_vbox_framebuffer (plane->state->fb)->obj); +drm_gem_vram_unpin (gbo); }static const u32 vbox_cursor_plane_formats[] = {
drivers/gpu/drm/vboxvideo/vbox_ttm.c +2 -221
250 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 17/19 drm/vboxvideo: Convert vboxvideo driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace vboxvideo's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement vbox_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 13 +-- drivers/gpu/drm/vboxvideo/vbox_drv.h | 15 +-- drivers/gpu/drm/vboxvideo/vbox_main.c | 13 +-- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 136 ++------------------------ 5 files changed, 14 insertions(+), 164 deletions(-)
drivers/gpu/drm/vboxvideo/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_VBOXVIDEO select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER select GENERIC_ALLOCATOR help This is a KMS driver for the virtual Graphics Card used in
drivers/gpu/drm/vboxvideo/vbox_drv.c +2 -11
@@ -191,13 +191,7 @@ static struct pci_driver vbox_pci_driver = {static const struct file_operations vbox_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .mmap = vbox_mmap, - .poll = drm_poll, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -215,10 +209,7 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel =DRIVER_PATCHLEVEL , - .gem_free_object_unlocked = - drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = vbox_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, +DRM_GEM_VRAM_DRIVER , .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export,
drivers/gpu/drm/vboxvideo/vbox_drv.h +1 -14
@@ -20,11 +20,7 @@#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> +#include <drm/drm_vram_mm_helper.h> #include "vboxvideo_guest.h" #include "vboxvideo_vbe.h"
@@ -78,10 +74,6 @@ struct vbox_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -struct mutex hw_mutex;/* protects modeset and accel/vbva accesses */ struct work_struct hotplug_work;u32 input_mapping_width;
@@ -169,16 +161,11 @@ int vboxfb_create(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes);void vbox_fbdev_fini (struct vbox_private *vbox); -int vbox_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -int vbox_mm_init (struct vbox_private *vbox);void vbox_mm_fini (struct vbox_private *vbox);int vbox_gem_create (struct vbox_private *vbox,u32 size,bool iskernel,struct drm_gem_object **obj); -int vbox_mmap (struct file *filp,struct vm_area_struct *vma);/* vbox_prime.c */ int vbox_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -11
@@ -283,7 +283,8 @@ int vbox_gem_create(struct vbox_private *vbox,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (&vbox->ddev, &vbox->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (&vbox->ddev, &vbox->ddev.vram_mm->bdev, + size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -295,13 +296,3 @@ int vbox_gem_create(struct vbox_private *vbox,return 0 ; } - -int vbox_dumb_create (struct drm_file *file, -struct drm_device *dev,struct drm_mode_create_dumb *args) -{ -struct vbox_private *vbox = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &vbox->ttm.bdev,0 , - false, args); - -}
drivers/gpu/drm/vboxvideo/vbox_ttm.c +8 -128
162 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 17/19 drm/vboxvideo: Convert vboxvideo driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace vboxvideo's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement vbox_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 13 +-- drivers/gpu/drm/vboxvideo/vbox_drv.h | 15 +-- drivers/gpu/drm/vboxvideo/vbox_main.c | 13 +-- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 136 ++------------------------ 5 files changed, 14 insertions(+), 164 deletions(-)
drivers/gpu/drm/vboxvideo/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_VBOXVIDEO select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER select GENERIC_ALLOCATOR help This is a KMS driver for the virtual Graphics Card used in
drivers/gpu/drm/vboxvideo/vbox_drv.c +2 -11
@@ -191,13 +191,7 @@ static struct pci_driver vbox_pci_driver = {static const struct file_operations vbox_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .mmap = vbox_mmap, - .poll = drm_poll, - .read = drm_read, +DRM_VRAM_MM_FILE_OPERATIONS };static struct drm_driver driver = {
@@ -215,10 +209,7 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel =DRIVER_PATCHLEVEL , - .gem_free_object_unlocked = - drm_gem_vram_driver_gem_free_object_unlocked, - .dumb_create = vbox_dumb_create, - .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, +DRM_GEM_VRAM_DRIVER , .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export,
drivers/gpu/drm/vboxvideo/vbox_drv.h +1 -14
@@ -20,11 +20,7 @@#include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_placement.h> -#include <drm/ttm/ttm_memory.h> -#include <drm/ttm/ttm_module.h> +#include <drm/drm_vram_mm_helper.h> #include "vboxvideo_guest.h" #include "vboxvideo_vbe.h"
@@ -78,10 +74,6 @@ struct vbox_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; -struct mutex hw_mutex;/* protects modeset and accel/vbva accesses */ struct work_struct hotplug_work;u32 input_mapping_width;
@@ -169,16 +161,11 @@ int vboxfb_create(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes);void vbox_fbdev_fini (struct vbox_private *vbox); -int vbox_dumb_create (struct drm_file *file, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -int vbox_mm_init (struct vbox_private *vbox);void vbox_mm_fini (struct vbox_private *vbox);int vbox_gem_create (struct vbox_private *vbox,u32 size,bool iskernel,struct drm_gem_object **obj); -int vbox_mmap (struct file *filp,struct vm_area_struct *vma);/* vbox_prime.c */ int vbox_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -11
@@ -283,7 +283,8 @@ int vbox_gem_create(struct vbox_private *vbox,if (size ==0 )return -EINVAL ; - gbo =drm_gem_vram_create (&vbox->ddev, &vbox->ttm.bdev, size,0 , false); + gbo =drm_gem_vram_create (&vbox->ddev, &vbox->ddev.vram_mm->bdev, + size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -295,13 +296,3 @@ int vbox_gem_create(struct vbox_private *vbox,return 0 ; } - -int vbox_dumb_create (struct drm_file *file, -struct drm_device *dev,struct drm_mode_create_dumb *args) -{ -struct vbox_private *vbox = dev->dev_private; - -return drm_gem_vram_fill_create_dumb (file, dev, &vbox->ttm.bdev,0 , - false, args); - -}
drivers/gpu/drm/vboxvideo/vbox_ttm.c +8 -128
162 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 18/19 drm/hisilicon: Convert hibmc-drm driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct hibmc_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 21 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 25 +-- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +-- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 210 +----------------- 6 files changed, 44 insertions(+), 248 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_HISI_HIBMC depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help Choose this option if you have a Hisilicon Hibmc soc chipset.
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +13 -8
@@ -96,27 +96,32 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,struct drm_plane_state *state = plane->state;u32 reg;int ret; -u64 gpu_addr =0 ; +s64 gpu_addr =0 ;unsigned int line_l;struct hibmc_drm_private *priv = plane->dev->dev_private;struct hibmc_framebuffer *hibmc_fb; -struct hibmc_bo *bo; +struct drm_gem_vram_object *gbo;if (!state->fb)return ; hibmc_fb =to_hibmc_framebuffer (state->fb); - bo =gem_to_hibmc_bo (hibmc_fb->obj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); + gbo =drm_gem_vram_of_gem (hibmc_fb->obj); + ret =drm_gem_vram_reserve (gbo, false);if (ret) { -DRM_ERROR ("failed to reserve ttm_bo: %d" , ret); +DRM_ERROR ("failed to reserve BO: %d" , ret);return ; } - ret =hibmc_bo_pin (bo,TTM_PL_FLAG_VRAM , &gpu_addr); -ttm_bo_unreserve (&bo->bo); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM ); +drm_gem_vram_unreserve (gbo);if (ret) { -DRM_ERROR ("failed to pin hibmc_bo: %d" , ret); +DRM_ERROR ("failed to pin bo: %d" , ret); +return ; + } + gpu_addr =drm_gem_vram_offset (gbo); +if (gpu_addr <0 ) { +drm_gem_vram_unpin (gbo);return ; }
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3 -2
@@ -63,9 +63,10 @@ static struct drm_driver hibmc_driver = { .desc = "hibmc drm driver", .major = 1, .minor = 0, - .gem_free_object_unlocked = hibmc_gem_free_object, + .gem_free_object_unlocked = + drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = hibmc_dumb_create, - .dumb_map_offset = hibmc_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .irq_handler = hibmc_drm_interrupt, };
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +1 -24
@@ -23,6 +23,7 @@#include <drm/drm_atomic.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/ttm/ttm_bo_driver.h> struct hibmc_framebuffer {
@@ -59,25 +60,6 @@ struct hibmc_drm_private {#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb) -struct hibmc_bo { -struct ttm_buffer_object bo; -struct ttm_placement placement; -struct ttm_bo_kmap_obj kmap; -struct drm_gem_object gem; -struct ttm_place placements[3 ]; -int pin_count; -}; - -static inline struct hibmc_bo *hibmc_bo (struct ttm_buffer_object *bo) -{ - return container_of(bo, struct hibmc_bo, bo); -} - -static inline struct hibmc_bo *gem_to_hibmc_bo (struct drm_gem_object *gem) -{ - return container_of(gem, struct hibmc_bo, gem); -} -void hibmc_set_power_mode (struct hibmc_drm_private *priv,unsigned int power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv,
@@ -97,13 +79,8 @@ hibmc_framebuffer_init(struct drm_device *dev,int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc); -int hibmc_bo_pin (struct hibmc_bo *bo,u32 pl_flag,u64 *gpu_addr); -int hibmc_bo_unpin (struct hibmc_bo *bo); -void hibmc_gem_free_object (struct drm_gem_object *obj);int hibmc_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int hibmc_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev, -u32 handle,u64 *offset);int hibmc_mmap (struct file *filp,struct vm_area_struct *vma);extern const struct drm_mode_config_funcs hibmc_mode_funcs;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +16 -14
@@ -66,7 +66,8 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,int ret1;size_t size;unsigned int bytes_per_pixel; -struct hibmc_bo *bo =NULL ; +struct drm_gem_vram_object *gbo =NULL ; +void *base; DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n", sizes->surface_width, sizes->surface_height,
@@ -88,26 +89,27 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,return -ENOMEM ; } - bo =gem_to_hibmc_bo (gobj); + gbo =drm_gem_vram_of_gem (gobj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); + ret =drm_gem_vram_reserve (gbo, false);if (ret) { -DRM_ERROR ("failed to reserve ttm_bo: %d\n" , ret); +DRM_ERROR ("failed to reserve bo: %d\n" , ret); goto out_unref_gem; } - ret =hibmc_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon: %d\n" , ret); goto out_unreserve_ttm_bo; } - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); -if (ret) { + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon: %d\n" , ret); goto out_unpin_bo; } -ttm_bo_unreserve (&bo->bo); +drm_gem_vram_unreserve (gbo); info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) {
@@ -131,24 +133,24 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,drm_fb_helper_fill_info (info, &priv->fbdev->helper, sizes); - info->screen_base = bo->kmap.virtual; + info->screen_base = base; info->screen_size = size; - info->fix.smem_start = bo->bo.mem.bus.offset + bo->bo.mem.bus.base; + info->fix.smem_start = gbo->bo.mem.bus.offset + gbo->bo.mem.bus.base; info->fix.smem_len = size;return 0 ; out_release_fbi: - ret1 =ttm_bo_reserve (&bo->bo, true, false,NULL ); + ret1 =drm_gem_vram_reserve (gbo, false);if (ret1) {DRM_ERROR ("failed to rsv ttm_bo when release fbi: %d\n" , ret1); goto out_unref_gem; } -ttm_bo_kunmap (&bo->kmap); +drm_gem_vram_kunmap (gbo); out_unpin_bo: -hibmc_bo_unpin (bo); +drm_gem_vram_unpin (gbo); out_unreserve_ttm_bo: -ttm_bo_unreserve (&bo->bo); +drm_gem_vram_unreserve (gbo); out_unref_gem:drm_gem_object_put_unlocked (gobj);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -200
257 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 18/19 drm/hisilicon: Convert hibmc-drm driver to |struct drm_gem_vram_object|
In reply to Thomas ZimmermannThe data structure |struct drm_gem_vram_object| and its helpers replace |struct hibmc_bo|. It's the same implementation; except for the type names.
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 21 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 25 +-- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +-- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 210 +----------------- 6 files changed, 44 insertions(+), 248 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -0
@@ -3,6 +3,7 @@ config DRM_HISI_HIBMC depends on DRM && PCI && MMU select DRM_KMS_HELPER select DRM_TTM + select DRM_GEM_VRAM_HELPER help Choose this option if you have a Hisilicon Hibmc soc chipset.
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +13 -8
@@ -96,27 +96,32 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,struct drm_plane_state *state = plane->state;u32 reg;int ret; -u64 gpu_addr =0 ; +s64 gpu_addr =0 ;unsigned int line_l;struct hibmc_drm_private *priv = plane->dev->dev_private;struct hibmc_framebuffer *hibmc_fb; -struct hibmc_bo *bo; +struct drm_gem_vram_object *gbo;if (!state->fb)return ; hibmc_fb =to_hibmc_framebuffer (state->fb); - bo =gem_to_hibmc_bo (hibmc_fb->obj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); + gbo =drm_gem_vram_of_gem (hibmc_fb->obj); + ret =drm_gem_vram_reserve (gbo, false);if (ret) { -DRM_ERROR ("failed to reserve ttm_bo: %d" , ret); +DRM_ERROR ("failed to reserve BO: %d" , ret);return ; } - ret =hibmc_bo_pin (bo,TTM_PL_FLAG_VRAM , &gpu_addr); -ttm_bo_unreserve (&bo->bo); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM ); +drm_gem_vram_unreserve (gbo);if (ret) { -DRM_ERROR ("failed to pin hibmc_bo: %d" , ret); +DRM_ERROR ("failed to pin bo: %d" , ret); +return ; + } + gpu_addr =drm_gem_vram_offset (gbo); +if (gpu_addr <0 ) { +drm_gem_vram_unpin (gbo);return ; }
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +3 -2
@@ -63,9 +63,10 @@ static struct drm_driver hibmc_driver = { .desc = "hibmc drm driver", .major = 1, .minor = 0, - .gem_free_object_unlocked = hibmc_gem_free_object, + .gem_free_object_unlocked = + drm_gem_vram_driver_gem_free_object_unlocked, .dumb_create = hibmc_dumb_create, - .dumb_map_offset = hibmc_dumb_mmap_offset, + .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .irq_handler = hibmc_drm_interrupt, };
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +1 -24
@@ -23,6 +23,7 @@#include <drm/drm_atomic.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/ttm/ttm_bo_driver.h> struct hibmc_framebuffer {
@@ -59,25 +60,6 @@ struct hibmc_drm_private {#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb) -struct hibmc_bo { -struct ttm_buffer_object bo; -struct ttm_placement placement; -struct ttm_bo_kmap_obj kmap; -struct drm_gem_object gem; -struct ttm_place placements[3 ]; -int pin_count; -}; - -static inline struct hibmc_bo *hibmc_bo (struct ttm_buffer_object *bo) -{ - return container_of(bo, struct hibmc_bo, bo); -} - -static inline struct hibmc_bo *gem_to_hibmc_bo (struct drm_gem_object *gem) -{ - return container_of(gem, struct hibmc_bo, gem); -} -void hibmc_set_power_mode (struct hibmc_drm_private *priv,unsigned int power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv,
@@ -97,13 +79,8 @@ hibmc_framebuffer_init(struct drm_device *dev,int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc); -int hibmc_bo_pin (struct hibmc_bo *bo,u32 pl_flag,u64 *gpu_addr); -int hibmc_bo_unpin (struct hibmc_bo *bo); -void hibmc_gem_free_object (struct drm_gem_object *obj);int hibmc_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int hibmc_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev, -u32 handle,u64 *offset);int hibmc_mmap (struct file *filp,struct vm_area_struct *vma);extern const struct drm_mode_config_funcs hibmc_mode_funcs;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +16 -14
@@ -66,7 +66,8 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,int ret1;size_t size;unsigned int bytes_per_pixel; -struct hibmc_bo *bo =NULL ; +struct drm_gem_vram_object *gbo =NULL ; +void *base; DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n", sizes->surface_width, sizes->surface_height,
@@ -88,26 +89,27 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,return -ENOMEM ; } - bo =gem_to_hibmc_bo (gobj); + gbo =drm_gem_vram_of_gem (gobj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); + ret =drm_gem_vram_reserve (gbo, false);if (ret) { -DRM_ERROR ("failed to reserve ttm_bo: %d\n" , ret); +DRM_ERROR ("failed to reserve bo: %d\n" , ret); goto out_unref_gem; } - ret =hibmc_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =drm_gem_vram_pin (gbo,DRM_GEM_VRAM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon: %d\n" , ret); goto out_unreserve_ttm_bo; } - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, &bo->kmap); -if (ret) { + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { + ret =PTR_ERR (base);DRM_ERROR ("failed to kmap fbcon: %d\n" , ret); goto out_unpin_bo; } -ttm_bo_unreserve (&bo->bo); +drm_gem_vram_unreserve (gbo); info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) {
@@ -131,24 +133,24 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,drm_fb_helper_fill_info (info, &priv->fbdev->helper, sizes); - info->screen_base = bo->kmap.virtual; + info->screen_base = base; info->screen_size = size; - info->fix.smem_start = bo->bo.mem.bus.offset + bo->bo.mem.bus.base; + info->fix.smem_start = gbo->bo.mem.bus.offset + gbo->bo.mem.bus.base; info->fix.smem_len = size;return 0 ; out_release_fbi: - ret1 =ttm_bo_reserve (&bo->bo, true, false,NULL ); + ret1 =drm_gem_vram_reserve (gbo, false);if (ret1) {DRM_ERROR ("failed to rsv ttm_bo when release fbi: %d\n" , ret1); goto out_unref_gem; } -ttm_bo_kunmap (&bo->kmap); +drm_gem_vram_kunmap (gbo); out_unpin_bo: -hibmc_bo_unpin (bo); +drm_gem_vram_unpin (gbo); out_unreserve_ttm_bo: -ttm_bo_unreserve (&bo->bo); +drm_gem_vram_unreserve (gbo); out_unref_gem:drm_gem_object_put_unlocked (gobj);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -200
257 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v3 19/19 drm/hisilicon: Convert hibmc-drm driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace hibmc's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement hibmc_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 8 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 8 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 139 ++---------------- 4 files changed, 13 insertions(+), 143 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_HISI_HIBMC select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Choose this option if you have a Hisilicon Hibmc soc chipset.
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -7
@@ -27,14 +27,8 @@static const struct file_operations hibmc_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .mmap = hibmc_mmap, - .poll = drm_poll, - .read = drm_read, .llseek = no_llseek, +DRM_VRAM_MM_FILE_OPERATIONS };static irqreturn_t hibmc_drm_interrupt (int irq,void *arg)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +1 -7
@@ -24,7 +24,7 @@#include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_driver.h> +#include <drm/drm_vram_mm_helper.h> struct hibmc_framebuffer {struct drm_framebuffer fb;
@@ -49,13 +49,8 @@ struct hibmc_drm_private {struct drm_device *dev;bool mode_config_initialized; -/* ttm */ -struct ttm_bo_device bdev; -bool initialized; -/* fbdev */ struct hibmc_fbdev *fbdev; -bool mm_inited; };#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb)
@@ -81,7 +76,6 @@ 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,struct drm_mode_create_dumb *args); -int hibmc_mmap (struct file *filp,struct vm_area_struct *vma);extern const struct drm_mode_config_funcs hibmc_mode_funcs;
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -129
174 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v3 19/19 drm/hisilicon: Convert hibmc-drm driver to VRAM MM
In reply to Thomas ZimmermannThe data structure |struct drm_vram_mm| and its helpers replace hibmc's TTM-based memory manager. It's the same implementation; except for the type names.
v3:
* use drm_gem_vram_mm_funcs
* convert driver to drm_device-based instance
v2:
* implement hibmc_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 8 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 8 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 139 ++---------------- 4 files changed, 13 insertions(+), 143 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_HISI_HIBMC select DRM_KMS_HELPER select DRM_TTM select DRM_GEM_VRAM_HELPER + select DRM_VRAM_MM_HELPER help Choose this option if you have a Hisilicon Hibmc soc chipset.
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -7
@@ -27,14 +27,8 @@static const struct file_operations hibmc_fops = { .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .compat_ioctl = drm_compat_ioctl, - .mmap = hibmc_mmap, - .poll = drm_poll, - .read = drm_read, .llseek = no_llseek, +DRM_VRAM_MM_FILE_OPERATIONS };static irqreturn_t hibmc_drm_interrupt (int irq,void *arg)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +1 -7
@@ -24,7 +24,7 @@#include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> -#include <drm/ttm/ttm_bo_driver.h> +#include <drm/drm_vram_mm_helper.h> struct hibmc_framebuffer {struct drm_framebuffer fb;
@@ -49,13 +49,8 @@ struct hibmc_drm_private {struct drm_device *dev;bool mode_config_initialized; -/* ttm */ -struct ttm_bo_device bdev; -bool initialized; -/* fbdev */ struct hibmc_fbdev *fbdev; -bool mm_inited; };#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb)
@@ -81,7 +76,6 @@ 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,struct drm_mode_create_dumb *args); -int hibmc_mmap (struct file *filp,struct vm_area_struct *vma);extern const struct drm_mode_config_funcs hibmc_mode_funcs;
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -129
174 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel