Share TTM code among DRM framebuffer drivers
Subsystems (8)
Thomas Zimmermann
maintainerv2 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.
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 (17):
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/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 | 4 +- drivers/gpu/drm/ast/ast_drv.h | 65 +- drivers/gpu/drm/ast/ast_fb.c | 30 +- drivers/gpu/drm/ast/ast_main.c | 74 +-- drivers/gpu/drm/ast/ast_mode.c | 124 ++-- drivers/gpu/drm/ast/ast_ttm.c | 293 +-------- drivers/gpu/drm/bochs/Kconfig | 2 + drivers/gpu/drm/bochs/bochs.h | 45 +- drivers/gpu/drm/bochs/bochs_drv.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 395 +----------- drivers/gpu/drm/drm_gem_vram_helper.c | 570 ++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + drivers/gpu/drm/drm_vram_mm_helper.c | 210 +++++++ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + .../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 | 32 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 329 +--------- drivers/gpu/drm/mgag200/Kconfig | 2 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 88 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 74 +-- drivers/gpu/drm/mgag200/mgag200_fb.c | 30 +- drivers/gpu/drm/mgag200/mgag200_main.c | 84 +-- drivers/gpu/drm/mgag200/mgag200_mode.c | 52 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 293 +-------- drivers/gpu/drm/vboxvideo/Kconfig | 2 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 68 +-- 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 | 347 +---------- include/drm/drm_gem_vram_helper.h | 120 ++++ include/drm/drm_vram_mm_helper.h | 67 ++ 41 files changed, 1445 insertions(+), 2231 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 v2 1/17 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
@@ -33,6 +33,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 v2 1/17 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
@@ -33,6 +33,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
Thomas Zimmermann
maintainerPATCH v2 2/17 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 v2 2/17 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
maintainerRe: [PATCH v2 02/17] drm: Add |struct drm_gem_vram_object| callbacks for |struct ttm_bo_driver|
Hi Christian,
Am 24.04.19 um 13:48 schrieb Thomas Zimmermann:
Quoted 19 lines
drivers/gpu/drm/drm_gem_vram_helper.c +19
-0+ +/* +* 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) +{
drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 439
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +10
-0+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; +}
For drm_is_gem_vram(), I'm not quite sure what else to test for. So there are still a few things I'd like to discuss.
1) If this test is about the placement flags, then it's unrelated to
the actual DRM driver. All buffers of type |struct drm_gem_vram_object| share the same placement flags.
2) I tested the code to work with ast and mgag200.
3) If this test is really about individual instances of each DRM
driver, then the current implementations are already broken. In this scenario TTM should sort out BOs with a BO device different from the one that triggered the eviction process; or pass the original BO device to the evict_flags callback, so we can sort out buffers here.
Best regards
Thomas
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 v2 02/17] drm: Add |struct drm_gem_vram_object| callbacks for |struct ttm_bo_driver|
Am 24.04.19 um 14:05 schrieb Thomas Zimmermann:
Quoted 39 lines
Hi Christian,
Am 24.04.19 um 13:48 schrieb Thomas Zimmermann:
Quoted 19 lines
drivers/gpu/drm/drm_gem_vram_helper.c +19
-0+ +/* +* 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) +{drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 439
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +10
-0+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; +}For
drm_is_gem_vram(), I'm not quite sure what else to test for. So there are still a few things I'd like to discuss.1) If this test is about the placement flags, then it's unrelated to
the actual DRM driver. All buffers of type |struct drm_gem_vram_object| share the same placement flags.
Quoted 7 lines
2) I tested the code to work with ast and mgag200.
3) If this test is really about individual instances of each DRM
driver, then the current implementations are already broken. In this scenario TTM should sort out BOs with a BO device different from the one that triggered the eviction process; or pass the original BO device to theevict_flagscallback, so we can sort out buffers here.
Just go ahead with the current approach for now. It could be that we see fallout, but that is really unlikely.
Christian.
Quoted 4 lines
Best regards
Thomas
Re: [PATCH v2 02/17] drm: Add |struct drm_gem_vram_object| callbacks for |struct ttm_bo_driver|
In reply to Thomas ZimmermannAm 24.04.19 um 14:05 schrieb Thomas Zimmermann:
Quoted 39 lines
Hi Christian,
Am 24.04.19 um 13:48 schrieb Thomas Zimmermann:
Quoted 19 lines
drivers/gpu/drm/drm_gem_vram_helper.c +19
-0+ +/* +* 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) +{drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 439
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +10
-0+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; +}For
drm_is_gem_vram(), I'm not quite sure what else to test for. So there are still a few things I'd like to discuss.1) If this test is about the placement flags, then it's unrelated to
the actual DRM driver. All buffers of type |struct drm_gem_vram_object| share the same placement flags.
Quoted 7 lines
2) I tested the code to work with ast and mgag200.
3) If this test is really about individual instances of each DRM
driver, then the current implementations are already broken. In this scenario TTM should sort out BOs with a BO device different from the one that triggered the eviction process; or pass the original BO device to theevict_flagscallback, so we can sort out buffers here.
Just go ahead with the current approach for now. It could be that we see fallout, but that is really unlikely.
Christian.
Quoted 4 lines
Best regards
Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 3/17 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 v2 4/17 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 v2 4/17 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 v2 5/17 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
@@ -35,6 +35,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 v2 5/17 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
@@ -35,6 +35,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
Re: [PATCH v2 05/17] drm: Add VRAM MM, a simple memory manager for dedicated VRAM
Quoted 3 lines · Thomas Zimmermann
The 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.
I'm not sure keeping these two helpers strictly separated helps us. If forces things like the verify_access callback, which everyone just implements the exact same way.
I'd merge them, or at least make these callbacks call the gem_vram_object implementations by default.
-Daniel
Quoted 375 lines
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 structdrm_vram_mm
* adddrm_vram_mm_mmap()helper
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- 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.hDocumentation/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 DRMdrivers/gpu/drm/Makefile +1
-0@@ -35,6 +35,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@@ -0,0 +1,210 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <drm/drm_vram_mm_helper.h> +#include <drm/drmP.h> +#include <drm/ttm/ttm_page_alloc.h> + +/** +* DOC: overview +* +* The data structure &struct drm_vram_mm and its helpers implement a memory +* manager for simple framebuffer devices with dedicated video memory. Buffer +* object s are either placed in VRAM or evicted to system ram. The functions +* work well with &struct drm_gem_vram_object. +*/ + +/* +* TTM TT +*/ + +static void backend_func_destroy (struct ttm_tt *tt) +{ +ttm_tt_fini (tt); +kfree (tt); +} + +static struct ttm_backend_func backend_func = { + .destroy = backend_func_destroy +}; + +/* +* TTM BO device +*/ + +static struct ttm_tt *bo_driver_ttm_tt_create (struct ttm_buffer_object *bo, +uint32_t page_flags) +{ +struct ttm_tt *tt; +int ret; + + tt =kzalloc (sizeof (*tt),GFP_KERNEL ); +if (!tt) +return NULL ; + + tt->func = &backend_func; + + ret =ttm_tt_init (tt, bo, page_flags); +if (ret <0 ) + goto err_ttm_tt_init; + +return tt; + +err_ttm_tt_init: +kfree (tt); +return NULL ; +} + +static int bo_driver_init_mem_type (struct ttm_bo_device *bdev,uint32_t type, +struct ttm_mem_type_manager *man) +{ +switch (type) { +case TTM_PL_SYSTEM : + man->flags =TTM_MEMTYPE_FLAG_MAPPABLE ; + man->available_caching =TTM_PL_MASK_CACHING ; + man->default_caching =TTM_PL_FLAG_CACHED ; +break ; +case TTM_PL_VRAM : + man->func = &ttm_bo_manager_func; + man->flags =TTM_MEMTYPE_FLAG_FIXED | +TTM_MEMTYPE_FLAG_MAPPABLE ; + man->available_caching =TTM_PL_FLAG_UNCACHED | +TTM_PL_FLAG_WC ; + man->default_caching =TTM_PL_FLAG_WC ; +break ; +default : +return -EINVAL ; + } +return 0 ; +} + +static void bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *placement) +{ +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bo->bdev); + +if (vmm->funcs && vmm->funcs->evict_flags) + vmm->funcs->evict_flags (bo, placement); +} + +static int bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp) +{ +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bo->bdev); + +if (!vmm->funcs || !vmm->funcs->verify_access) +return 0 ; +return vmm->funcs->verify_access (bo, filp); +} + +static int bo_driver_io_mem_reserve (struct ttm_bo_device *bdev, +struct ttm_mem_reg *mem) +{ +struct ttm_mem_type_manager *man = bdev->man + mem->mem_type; +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev); + +if (!(man->flags &TTM_MEMTYPE_FLAG_MAPPABLE )) +return -EINVAL ; + + mem->bus.addr =NULL ; + mem->bus.size = mem->num_pages <<PAGE_SHIFT ; + +switch (mem->mem_type) { +case TTM_PL_SYSTEM :/* nothing to do */ + mem->bus.offset =0 ; + mem->bus.base =0 ; + mem->bus.is_iomem = false; +break ; +case TTM_PL_VRAM : + mem->bus.offset = mem->start <<PAGE_SHIFT ; + mem->bus.base = vmm->vram_base; + mem->bus.is_iomem = true; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static void bo_driver_io_mem_free (struct ttm_bo_device *bdev, +struct ttm_mem_reg *mem) +{ } + +static struct ttm_bo_driver bo_driver = { + .ttm_tt_create = bo_driver_ttm_tt_create, + .ttm_tt_populate = ttm_pool_populate, + .ttm_tt_unpopulate = ttm_pool_unpopulate, + .init_mem_type = bo_driver_init_mem_type, + .eviction_valuable = ttm_bo_eviction_valuable, + .evict_flags = bo_driver_evict_flags, + .verify_access = bo_driver_verify_access, + .io_mem_reserve = bo_driver_io_mem_reserve, + .io_mem_free = bo_driver_io_mem_free, +}; + +/* +* struct drm_vram_mm +*/ + +/** +* drm_vram_mm_init() - Initialize an instance of VRAM MM. +* @vmm: the VRAM MM instance to initialize +* @dev: the DRM device +* @vram_base: the base address of the video memory +* @vram_size: the size of the video memory in bytes +* @funcs: callback functions for buffer objects +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_vram_mm_init (struct drm_vram_mm *vmm,struct drm_device *dev, +u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs) +{ +int ret; + + vmm->vram_base = vram_base; + vmm->vram_size = vram_size; + vmm->funcs = funcs; + + ret =ttm_bo_device_init (&vmm->bdev, &bo_driver, + dev->anon_inode->i_mapping, + true); +if (ret) +return ret; + + ret =ttm_bo_init_mm (&vmm->bdev,TTM_PL_VRAM , vram_size >>PAGE_SHIFT ); +if (ret) +return ret; + +return 0 ; +} +EXPORT_SYMBOL (drm_vram_mm_init); + +/** +* drm_vram_mm_cleanup() - Cleans up an initialized instance of VRAM MM. +* @vmm: the VRAM MM instance to clean up +*/ +void drm_vram_mm_cleanup (struct drm_vram_mm *vmm) +{ +ttm_bo_device_release (&vmm->bdev); +} +EXPORT_SYMBOL (drm_vram_mm_cleanup); + +/** +* drm_vram_mm_mmap() - Helper for implementing &struct file_operations.mmap() +* @filp: the mapping's file structure +* @vma: the mapping's memory area +* @vmm: the VRAM MM instance +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_vram_mm_mmap (struct file *filp,struct vm_area_struct *vma, +struct drm_vram_mm *vmm) +{ +return ttm_bo_mmap (filp, vma, &vmm->bdev); +} +EXPORT_SYMBOL (drm_vram_mm_mmap);include/drm/drm_vram_mm_helper.h new file +67
-0@@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_VRAM_MM_HELPER_H +#define DRM_VRAM_MM_HELPER_H + +#include <drm/ttm/ttm_bo_driver.h> + +struct drm_device ; + +/** +* struct drm_vram_mm_funcs - Callback functions for &struct drm_vram_mm +* @evict_flags: Provides an implementation for struct &ttm_bo_driver.evict_flags +* @verify_access: Provides an implementation for struct &ttm_bo_driver.verify_access +* +* These callback function integrate VRAM MM with TTM buffer objects. New +* functions can be added if necessary. +*/ +struct drm_vram_mm_funcs { +void (*evict_flags)(struct ttm_buffer_object *bo, +struct ttm_placement *placement); +int (*verify_access)(struct ttm_buffer_object *bo,struct file *filp); +}; + +/** +* struct drm_vram_mm - An instance of VRAM MM +* @vram_base: Base address of the managed video memory +* @vram_size: Size of the managed video memory in bytes +* @bdev: The TTM BO device. +* @funcs: TTM BO functions +* +* The fields &struct drm_vram_mm.vram_base and +* &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are +* available for public read access. Use the field +* &struct drm_vram_mm.bdev to access the TTM BO device. +*/ +struct drm_vram_mm { +u64 vram_base; +unsigned long vram_size; + +struct ttm_bo_device bdev; + +const struct drm_vram_mm_funcs *funcs; +}; + +/** +* drm_vram_mm_of_bdev() - \ +Returns the container of type &struct ttm_bo_device for field bdev. +* @bdev: the TTM BO device +* +* Returns: +* The containing instance of &struct drm_vram_mm +*/ +static inline struct drm_vram_mm *drm_vram_mm_of_bdev ( +struct ttm_bo_device *bdev) +{ + return container_of(bdev, struct drm_vram_mm, bdev); +} + +int drm_vram_mm_init (struct drm_vram_mm *vmm,struct drm_device *dev, +u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs); +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); + +#endif Signature · 1 line
2.21.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH v2 05/17] drm: Add VRAM MM, a simple memory manager for dedicated VRAM
In reply to Thomas ZimmermannQuoted 3 lines · Thomas Zimmermann
The 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.
I'm not sure keeping these two helpers strictly separated helps us. If forces things like the verify_access callback, which everyone just implements the exact same way.
I'd merge them, or at least make these callbacks call the gem_vram_object implementations by default.
-Daniel
Quoted 375 lines
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 structdrm_vram_mm
* adddrm_vram_mm_mmap()helper
* documentation fixesSigned-off-by Thomas Zimmermann <[email protected]>--- 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.hDocumentation/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 DRMdrivers/gpu/drm/Makefile +1
-0@@ -35,6 +35,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@@ -0,0 +1,210 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <drm/drm_vram_mm_helper.h> +#include <drm/drmP.h> +#include <drm/ttm/ttm_page_alloc.h> + +/** +* DOC: overview +* +* The data structure &struct drm_vram_mm and its helpers implement a memory +* manager for simple framebuffer devices with dedicated video memory. Buffer +* object s are either placed in VRAM or evicted to system ram. The functions +* work well with &struct drm_gem_vram_object. +*/ + +/* +* TTM TT +*/ + +static void backend_func_destroy (struct ttm_tt *tt) +{ +ttm_tt_fini (tt); +kfree (tt); +} + +static struct ttm_backend_func backend_func = { + .destroy = backend_func_destroy +}; + +/* +* TTM BO device +*/ + +static struct ttm_tt *bo_driver_ttm_tt_create (struct ttm_buffer_object *bo, +uint32_t page_flags) +{ +struct ttm_tt *tt; +int ret; + + tt =kzalloc (sizeof (*tt),GFP_KERNEL ); +if (!tt) +return NULL ; + + tt->func = &backend_func; + + ret =ttm_tt_init (tt, bo, page_flags); +if (ret <0 ) + goto err_ttm_tt_init; + +return tt; + +err_ttm_tt_init: +kfree (tt); +return NULL ; +} + +static int bo_driver_init_mem_type (struct ttm_bo_device *bdev,uint32_t type, +struct ttm_mem_type_manager *man) +{ +switch (type) { +case TTM_PL_SYSTEM : + man->flags =TTM_MEMTYPE_FLAG_MAPPABLE ; + man->available_caching =TTM_PL_MASK_CACHING ; + man->default_caching =TTM_PL_FLAG_CACHED ; +break ; +case TTM_PL_VRAM : + man->func = &ttm_bo_manager_func; + man->flags =TTM_MEMTYPE_FLAG_FIXED | +TTM_MEMTYPE_FLAG_MAPPABLE ; + man->available_caching =TTM_PL_FLAG_UNCACHED | +TTM_PL_FLAG_WC ; + man->default_caching =TTM_PL_FLAG_WC ; +break ; +default : +return -EINVAL ; + } +return 0 ; +} + +static void bo_driver_evict_flags (struct ttm_buffer_object *bo, +struct ttm_placement *placement) +{ +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bo->bdev); + +if (vmm->funcs && vmm->funcs->evict_flags) + vmm->funcs->evict_flags (bo, placement); +} + +static int bo_driver_verify_access (struct ttm_buffer_object *bo, +struct file *filp) +{ +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bo->bdev); + +if (!vmm->funcs || !vmm->funcs->verify_access) +return 0 ; +return vmm->funcs->verify_access (bo, filp); +} + +static int bo_driver_io_mem_reserve (struct ttm_bo_device *bdev, +struct ttm_mem_reg *mem) +{ +struct ttm_mem_type_manager *man = bdev->man + mem->mem_type; +struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev); + +if (!(man->flags &TTM_MEMTYPE_FLAG_MAPPABLE )) +return -EINVAL ; + + mem->bus.addr =NULL ; + mem->bus.size = mem->num_pages <<PAGE_SHIFT ; + +switch (mem->mem_type) { +case TTM_PL_SYSTEM :/* nothing to do */ + mem->bus.offset =0 ; + mem->bus.base =0 ; + mem->bus.is_iomem = false; +break ; +case TTM_PL_VRAM : + mem->bus.offset = mem->start <<PAGE_SHIFT ; + mem->bus.base = vmm->vram_base; + mem->bus.is_iomem = true; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static void bo_driver_io_mem_free (struct ttm_bo_device *bdev, +struct ttm_mem_reg *mem) +{ } + +static struct ttm_bo_driver bo_driver = { + .ttm_tt_create = bo_driver_ttm_tt_create, + .ttm_tt_populate = ttm_pool_populate, + .ttm_tt_unpopulate = ttm_pool_unpopulate, + .init_mem_type = bo_driver_init_mem_type, + .eviction_valuable = ttm_bo_eviction_valuable, + .evict_flags = bo_driver_evict_flags, + .verify_access = bo_driver_verify_access, + .io_mem_reserve = bo_driver_io_mem_reserve, + .io_mem_free = bo_driver_io_mem_free, +}; + +/* +* struct drm_vram_mm +*/ + +/** +* drm_vram_mm_init() - Initialize an instance of VRAM MM. +* @vmm: the VRAM MM instance to initialize +* @dev: the DRM device +* @vram_base: the base address of the video memory +* @vram_size: the size of the video memory in bytes +* @funcs: callback functions for buffer objects +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_vram_mm_init (struct drm_vram_mm *vmm,struct drm_device *dev, +u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs) +{ +int ret; + + vmm->vram_base = vram_base; + vmm->vram_size = vram_size; + vmm->funcs = funcs; + + ret =ttm_bo_device_init (&vmm->bdev, &bo_driver, + dev->anon_inode->i_mapping, + true); +if (ret) +return ret; + + ret =ttm_bo_init_mm (&vmm->bdev,TTM_PL_VRAM , vram_size >>PAGE_SHIFT ); +if (ret) +return ret; + +return 0 ; +} +EXPORT_SYMBOL (drm_vram_mm_init); + +/** +* drm_vram_mm_cleanup() - Cleans up an initialized instance of VRAM MM. +* @vmm: the VRAM MM instance to clean up +*/ +void drm_vram_mm_cleanup (struct drm_vram_mm *vmm) +{ +ttm_bo_device_release (&vmm->bdev); +} +EXPORT_SYMBOL (drm_vram_mm_cleanup); + +/** +* drm_vram_mm_mmap() - Helper for implementing &struct file_operations.mmap() +* @filp: the mapping's file structure +* @vma: the mapping's memory area +* @vmm: the VRAM MM instance +* +* Returns: +* 0 on success, or +* a negative error code otherwise. +*/ +int drm_vram_mm_mmap (struct file *filp,struct vm_area_struct *vma, +struct drm_vram_mm *vmm) +{ +return ttm_bo_mmap (filp, vma, &vmm->bdev); +} +EXPORT_SYMBOL (drm_vram_mm_mmap);include/drm/drm_vram_mm_helper.h new file +67
-0@@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_VRAM_MM_HELPER_H +#define DRM_VRAM_MM_HELPER_H + +#include <drm/ttm/ttm_bo_driver.h> + +struct drm_device ; + +/** +* struct drm_vram_mm_funcs - Callback functions for &struct drm_vram_mm +* @evict_flags: Provides an implementation for struct &ttm_bo_driver.evict_flags +* @verify_access: Provides an implementation for struct &ttm_bo_driver.verify_access +* +* These callback function integrate VRAM MM with TTM buffer objects. New +* functions can be added if necessary. +*/ +struct drm_vram_mm_funcs { +void (*evict_flags)(struct ttm_buffer_object *bo, +struct ttm_placement *placement); +int (*verify_access)(struct ttm_buffer_object *bo,struct file *filp); +}; + +/** +* struct drm_vram_mm - An instance of VRAM MM +* @vram_base: Base address of the managed video memory +* @vram_size: Size of the managed video memory in bytes +* @bdev: The TTM BO device. +* @funcs: TTM BO functions +* +* The fields &struct drm_vram_mm.vram_base and +* &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are +* available for public read access. Use the field +* &struct drm_vram_mm.bdev to access the TTM BO device. +*/ +struct drm_vram_mm { +u64 vram_base; +unsigned long vram_size; + +struct ttm_bo_device bdev; + +const struct drm_vram_mm_funcs *funcs; +}; + +/** +* drm_vram_mm_of_bdev() - \ +Returns the container of type &struct ttm_bo_device for field bdev. +* @bdev: the TTM BO device +* +* Returns: +* The containing instance of &struct drm_vram_mm +*/ +static inline struct drm_vram_mm *drm_vram_mm_of_bdev ( +struct ttm_bo_device *bdev) +{ + return container_of(bdev, struct drm_vram_mm, bdev); +} + +int drm_vram_mm_init (struct drm_vram_mm *vmm,struct drm_device *dev, +u64 vram_base,unsigned long vram_size, +const struct drm_vram_mm_funcs * funcs); +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); + +#endif 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 v2 6/17 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 v2 6/17 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 v2 7/17 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.
v2:
* implement ast_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.h | 12 +--- drivers/gpu/drm/ast/ast_main.c | 4 +- drivers/gpu/drm/ast/ast_ttm.c | 123 +++------------------------------ 4 files changed, 14 insertions(+), 126 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.h +3 -9
@@ -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,9 +100,7 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;
drivers/gpu/drm/ast/ast_main.c +2 -2
@@ -603,7 +603,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, &ast->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -620,6 +620,6 @@ int ast_dumb_create(struct drm_file *file, {struct ast_private *ast = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &ast->vmm.bdev,0 , false, args); }
drivers/gpu/drm/ast/ast_ttm.c +8 -115
151 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v2 7/17 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.
v2:
* implement ast_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.h | 12 +--- drivers/gpu/drm/ast/ast_main.c | 4 +- drivers/gpu/drm/ast/ast_ttm.c | 123 +++------------------------------ 4 files changed, 14 insertions(+), 126 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.h +3 -9
@@ -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,9 +100,7 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;
drivers/gpu/drm/ast/ast_main.c +2 -2
@@ -603,7 +603,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, &ast->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -620,6 +620,6 @@ int ast_dumb_create(struct drm_file *file, {struct ast_private *ast = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &ast->vmm.bdev,0 , false, args); }
drivers/gpu/drm/ast/ast_ttm.c +8 -115
151 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 v2 07/17] drm/ast: Convert AST driver to VRAM MM
Quoted 74 lines · Thomas Zimmermann
The 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.
v2:
* implementast_mmap()withdrm_vram_mm_mmap()Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.h | 12 +--- drivers/gpu/drm/ast/ast_main.c | 4 +- drivers/gpu/drm/ast/ast_ttm.c | 123 +++------------------------------ 4 files changed, 14 insertions(+), 126 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.h +3
-9@@ -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,9 +100,7 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;drivers/gpu/drm/ast/ast_main.c +1
-1@@ -603,7 +603,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, &ast->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
drivers/gpu/drm/ast/ast_main.c int ast_dumb_create(struct drm_file *file, · line 624
Quoted 6 lines
drivers/gpu/drm/ast/ast_main.c +1
-1@@ -620,6 +620,6 @@ int ast_dumb_create(struct drm_file *file, {struct ast_private *ast = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &ast->vmm.bdev,0 , false, args);
I think storing the vram mm somewhere in drm_device would be nice, so that we can avoid all these trivial wrappers. Similar to how we store drm_device->dev already, so that cma helpers just work. Next to object_name_idr and vma_offset_manager, so it's at least grouped together.
Also with that you create an _OPS macro like for CMA helpers, to condense boilerplat even more.
-Daniel
Quoted 162 lines
drivers/gpu/drm/ast/ast_main.c +0
-0}drivers/gpu/drm/ast/ast_ttm.c +8
-115@@ -26,131 +26,24 @@* Authors: Dave Airlie <[email protected]> */ #include <drm/drmP.h> -#include <drm/ttm/ttm_page_alloc.h> #include "ast_drv.h" -static inline struct ast_private * -ast_bdev (struct ttm_bo_device *bd) -{ - return container_of(bd, struct ast_private, ttm.bdev); -} - -static int -ast_bo_init_mem_type (struct ttm_bo_device *bdev,uint32_t type, -struct ttm_mem_type_manager *man) -{ -switch (type) { -case TTM_PL_SYSTEM : - man->flags =TTM_MEMTYPE_FLAG_MAPPABLE ; - man->available_caching =TTM_PL_MASK_CACHING ; - man->default_caching =TTM_PL_FLAG_CACHED ; -break ; -case TTM_PL_VRAM : - man->func = &ttm_bo_manager_func; - man->flags =TTM_MEMTYPE_FLAG_FIXED | -TTM_MEMTYPE_FLAG_MAPPABLE ; - man->available_caching =TTM_PL_FLAG_UNCACHED | -TTM_PL_FLAG_WC ; - man->default_caching =TTM_PL_FLAG_WC ; -break ; -default : -DRM_ERROR ("Unsupported memory type %u\n" , (unsigned )type); -return -EINVAL ; - } -return 0 ; -} - -static int ast_ttm_io_mem_reserve (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem) -{ -struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; -struct ast_private *ast =ast_bdev (bdev); - - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -if (!(man->flags &TTM_MEMTYPE_FLAG_MAPPABLE )) -return -EINVAL ; -switch (mem->mem_type) { -case TTM_PL_SYSTEM : -/* system memory */ -return 0 ; -case TTM_PL_VRAM : - mem->bus.offset = mem->start <<PAGE_SHIFT ; - mem->bus.base =pci_resource_start (ast->dev->pdev,0 ); - mem->bus.is_iomem = true; -break ; -default : -return -EINVAL ; -break ; - } -return 0 ; -} - -static void ast_ttm_io_mem_free (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem) -{ -} - -static void ast_ttm_backend_destroy (struct ttm_tt *tt) -{ -ttm_tt_fini (tt); -kfree (tt); -} - -static struct ttm_backend_func ast_tt_backend_func = { - .destroy = &ast_ttm_backend_destroy, -}; - - -static struct ttm_tt *ast_ttm_tt_create (struct ttm_buffer_object *bo, -uint32_t page_flags) -{ -struct ttm_tt *tt; - - tt =kzalloc (sizeof (struct ttm_tt ),GFP_KERNEL ); -if (tt ==NULL ) -return NULL ; - tt->func = &ast_tt_backend_func; -if (ttm_tt_init (tt, bo, page_flags)) { -kfree (tt); -return NULL ; - } -return tt; -} - -struct ttm_bo_driver ast_bo_driver = { - .ttm_tt_create = ast_ttm_tt_create, - .init_mem_type = ast_bo_init_mem_type, - .eviction_valuable = ttm_bo_eviction_valuable, +static const struct drm_vram_mm_funcs ast_vram_mm_funcs = { .evict_flags = drm_gem_vram_bo_driver_evict_flags, - .move =NULL , - .verify_access = drm_gem_vram_bo_driver_verify_access, - .io_mem_reserve = &ast_ttm_io_mem_reserve, - .io_mem_free = &ast_ttm_io_mem_free, + .verify_access = drm_gem_vram_bo_driver_verify_access };int ast_mm_init (struct ast_private *ast) {int ret;struct drm_device *dev = ast->dev; -struct ttm_bo_device *bdev = &ast->ttm.bdev; - - ret =ttm_bo_device_init (&ast->ttm.bdev, - &ast_bo_driver, - dev->anon_inode->i_mapping, - true); -if (ret) { -DRM_ERROR ("Error initialising bo driver; %d\n" , ret); -return ret; - } - ret =ttm_bo_init_mm (bdev,TTM_PL_VRAM , - ast->vram_size >>PAGE_SHIFT ); + ret =drm_vram_mm_init (&ast->vmm, dev, +pci_resource_start (dev->pdev,0 ), + ast->vram_size, &ast_vram_mm_funcs);if (ret) { -DRM_ERROR ("Failed ttm VRAM init: %d\n" , ret); +DRM_ERROR ("Error initializing VRAM MM; %d\n" , ret);return ret; }@@ -166,7 +59,7 @@ void ast_mm_fini(struct ast_private *ast) {struct drm_device *dev = ast->dev; -ttm_bo_device_release (&ast->ttm.bdev); +drm_vram_mm_cleanup (&ast->vmm);arch_phys_wc_del (ast->fb_mtrr); arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),@@ -178,5 +71,5 @@ int ast_mmap(struct file *filp, struct vm_area_struct *vma)struct drm_file *file_priv = filp->private_data;struct ast_private *ast = file_priv->minor->dev->dev_private; -return ttm_bo_mmap (filp, vma, &ast->ttm.bdev); +return drm_vram_mm_mmap (filp, vma, &ast->vmm); }Signature · 1 line
2.21.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH v2 07/17] drm/ast: Convert AST driver to VRAM MM
In reply to Thomas ZimmermannQuoted 74 lines · Thomas Zimmermann
The 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.
v2:
* implementast_mmap()withdrm_vram_mm_mmap()Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/ast/ast_drv.h | 12 +--- drivers/gpu/drm/ast/ast_main.c | 4 +- drivers/gpu/drm/ast/ast_ttm.c | 123 +++------------------------------ 4 files changed, 14 insertions(+), 126 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.h +3
-9@@ -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,9 +100,7 @@ struct ast_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct drm_gem_object *cursor_cache;uint64_t cursor_cache_gpu_addr;drivers/gpu/drm/ast/ast_main.c +1
-1@@ -603,7 +603,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, &ast->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
drivers/gpu/drm/ast/ast_main.c int ast_dumb_create(struct drm_file *file, · line 624
Quoted 6 lines
drivers/gpu/drm/ast/ast_main.c +1
-1@@ -620,6 +620,6 @@ int ast_dumb_create(struct drm_file *file, {struct ast_private *ast = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &ast->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &ast->vmm.bdev,0 , false, args);
I think storing the vram mm somewhere in drm_device would be nice, so that we can avoid all these trivial wrappers. Similar to how we store drm_device->dev already, so that cma helpers just work. Next to object_name_idr and vma_offset_manager, so it's at least grouped together.
Also with that you create an _OPS macro like for CMA helpers, to condense boilerplat even more.
-Daniel
Quoted 162 lines
drivers/gpu/drm/ast/ast_main.c +0
-0}drivers/gpu/drm/ast/ast_ttm.c +8
-115@@ -26,131 +26,24 @@* Authors: Dave Airlie <[email protected]> */ #include <drm/drmP.h> -#include <drm/ttm/ttm_page_alloc.h> #include "ast_drv.h" -static inline struct ast_private * -ast_bdev (struct ttm_bo_device *bd) -{ - return container_of(bd, struct ast_private, ttm.bdev); -} - -static int -ast_bo_init_mem_type (struct ttm_bo_device *bdev,uint32_t type, -struct ttm_mem_type_manager *man) -{ -switch (type) { -case TTM_PL_SYSTEM : - man->flags =TTM_MEMTYPE_FLAG_MAPPABLE ; - man->available_caching =TTM_PL_MASK_CACHING ; - man->default_caching =TTM_PL_FLAG_CACHED ; -break ; -case TTM_PL_VRAM : - man->func = &ttm_bo_manager_func; - man->flags =TTM_MEMTYPE_FLAG_FIXED | -TTM_MEMTYPE_FLAG_MAPPABLE ; - man->available_caching =TTM_PL_FLAG_UNCACHED | -TTM_PL_FLAG_WC ; - man->default_caching =TTM_PL_FLAG_WC ; -break ; -default : -DRM_ERROR ("Unsupported memory type %u\n" , (unsigned )type); -return -EINVAL ; - } -return 0 ; -} - -static int ast_ttm_io_mem_reserve (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem) -{ -struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; -struct ast_private *ast =ast_bdev (bdev); - - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -if (!(man->flags &TTM_MEMTYPE_FLAG_MAPPABLE )) -return -EINVAL ; -switch (mem->mem_type) { -case TTM_PL_SYSTEM : -/* system memory */ -return 0 ; -case TTM_PL_VRAM : - mem->bus.offset = mem->start <<PAGE_SHIFT ; - mem->bus.base =pci_resource_start (ast->dev->pdev,0 ); - mem->bus.is_iomem = true; -break ; -default : -return -EINVAL ; -break ; - } -return 0 ; -} - -static void ast_ttm_io_mem_free (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem) -{ -} - -static void ast_ttm_backend_destroy (struct ttm_tt *tt) -{ -ttm_tt_fini (tt); -kfree (tt); -} - -static struct ttm_backend_func ast_tt_backend_func = { - .destroy = &ast_ttm_backend_destroy, -}; - - -static struct ttm_tt *ast_ttm_tt_create (struct ttm_buffer_object *bo, -uint32_t page_flags) -{ -struct ttm_tt *tt; - - tt =kzalloc (sizeof (struct ttm_tt ),GFP_KERNEL ); -if (tt ==NULL ) -return NULL ; - tt->func = &ast_tt_backend_func; -if (ttm_tt_init (tt, bo, page_flags)) { -kfree (tt); -return NULL ; - } -return tt; -} - -struct ttm_bo_driver ast_bo_driver = { - .ttm_tt_create = ast_ttm_tt_create, - .init_mem_type = ast_bo_init_mem_type, - .eviction_valuable = ttm_bo_eviction_valuable, +static const struct drm_vram_mm_funcs ast_vram_mm_funcs = { .evict_flags = drm_gem_vram_bo_driver_evict_flags, - .move =NULL , - .verify_access = drm_gem_vram_bo_driver_verify_access, - .io_mem_reserve = &ast_ttm_io_mem_reserve, - .io_mem_free = &ast_ttm_io_mem_free, + .verify_access = drm_gem_vram_bo_driver_verify_access };int ast_mm_init (struct ast_private *ast) {int ret;struct drm_device *dev = ast->dev; -struct ttm_bo_device *bdev = &ast->ttm.bdev; - - ret =ttm_bo_device_init (&ast->ttm.bdev, - &ast_bo_driver, - dev->anon_inode->i_mapping, - true); -if (ret) { -DRM_ERROR ("Error initialising bo driver; %d\n" , ret); -return ret; - } - ret =ttm_bo_init_mm (bdev,TTM_PL_VRAM , - ast->vram_size >>PAGE_SHIFT ); + ret =drm_vram_mm_init (&ast->vmm, dev, +pci_resource_start (dev->pdev,0 ), + ast->vram_size, &ast_vram_mm_funcs);if (ret) { -DRM_ERROR ("Failed ttm VRAM init: %d\n" , ret); +DRM_ERROR ("Error initializing VRAM MM; %d\n" , ret);return ret; }@@ -166,7 +59,7 @@ void ast_mm_fini(struct ast_private *ast) {struct drm_device *dev = ast->dev; -ttm_bo_device_release (&ast->ttm.bdev); +drm_vram_mm_cleanup (&ast->vmm);arch_phys_wc_del (ast->fb_mtrr); arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),@@ -178,5 +71,5 @@ int ast_mmap(struct file *filp, struct vm_area_struct *vma)struct drm_file *file_priv = filp->private_data;struct ast_private *ast = file_priv->minor->dev->dev_private; -return ttm_bo_mmap (filp, vma, &ast->ttm.bdev); +return drm_vram_mm_mmap (filp, vma, &ast->vmm); }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 v2 8/17 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
@@ -258,7 +258,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 v2 8/17 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
@@ -258,7 +258,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 v2 9/17 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 v2 9/17 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 v2 10/17 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.
v2:
* implement bochs_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 11 +-- drivers/gpu/drm/bochs/bochs_mm.c | 129 +++---------------------------- 3 files changed, 16 insertions(+), 125 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 +4 -7
@@ -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> /* ---------------------------------------------------------------------- */
@@ -75,11 +74,9 @@ struct bochs_device {struct drm_simple_display_pipe pipe;struct drm_connector connector; -/* ttm */ -struct { -struct ttm_bo_device bdev; -bool initialized; - } ttm; +/* vram */ +struct drm_vram_mm vmm; +bool vmm_initialized; };/* ---------------------------------------------------------------------- */
drivers/gpu/drm/bochs/bochs_mm.c +11 -118
163 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v2 10/17 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.
v2:
* implement bochs_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/bochs/Kconfig | 1 + drivers/gpu/drm/bochs/bochs.h | 11 +-- drivers/gpu/drm/bochs/bochs_mm.c | 129 +++---------------------------- 3 files changed, 16 insertions(+), 125 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 +4 -7
@@ -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> /* ---------------------------------------------------------------------- */
@@ -75,11 +74,9 @@ struct bochs_device {struct drm_simple_display_pipe pipe;struct drm_connector connector; -/* ttm */ -struct { -struct ttm_bo_device bdev; -bool initialized; - } ttm; +/* vram */ +struct drm_vram_mm vmm; +bool vmm_initialized; };/* ---------------------------------------------------------------------- */
drivers/gpu/drm/bochs/bochs_mm.c +11 -118
163 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 v2 11/17 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 v2 11/17 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 v2 12/17 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.
v2:
* implement mgag200_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_drv.h | 11 +-- drivers/gpu/drm/mgag200/mgag200_main.c | 8 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 123 ++----------------------- 4 files changed, 17 insertions(+), 126 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.h +3 -8
@@ -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,9 +209,7 @@ struct mga_device {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;/* SE model number stored in reg 0x1e24 */ u32 unique_rev_id;
drivers/gpu/drm/mgag200/mgag200_main.c +4 -4
@@ -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, &mdev->vmm.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, &mdev->vmm.bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 );if (IS_ERR (mdev->cursor.pixels_2) ||IS_ERR (mdev->cursor.pixels_1)) {
@@ -284,7 +284,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, &mdev->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -301,6 +301,6 @@ int mgag200_dumb_create(struct drm_file *file, {struct mga_device *mdev = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &mdev->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &mdev->vmm.bdev,0 , false, args); }
drivers/gpu/drm/mgag200/mgag200_ttm.c +9 -114
151 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v2 12/17 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.
v2:
* implement mgag200_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/mgag200/mgag200_drv.h | 11 +-- drivers/gpu/drm/mgag200/mgag200_main.c | 8 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 123 ++----------------------- 4 files changed, 17 insertions(+), 126 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.h +3 -8
@@ -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,9 +209,7 @@ struct mga_device {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;/* SE model number stored in reg 0x1e24 */ u32 unique_rev_id;
drivers/gpu/drm/mgag200/mgag200_main.c +4 -4
@@ -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, &mdev->vmm.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, &mdev->vmm.bdev,roundup (48 *64 ,PAGE_SIZE ),0 ,0 );if (IS_ERR (mdev->cursor.pixels_2) ||IS_ERR (mdev->cursor.pixels_1)) {
@@ -284,7 +284,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, &mdev->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -301,6 +301,6 @@ int mgag200_dumb_create(struct drm_file *file, {struct mga_device *mdev = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &mdev->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &mdev->vmm.bdev,0 , false, args); }
drivers/gpu/drm/mgag200/mgag200_ttm.c +9 -114
151 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 v2 13/17 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 v2 13/17 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
Thomas Zimmermann
maintainerPATCH v2 14/17 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.
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 58 +------ 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(+), 370 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 -57
80 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 v2 14/17 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.
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 58 +------ 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(+), 370 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 -57
80 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 v2 15/17 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.
v2:
* implement vbox_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.h | 10 +- drivers/gpu/drm/vboxvideo/vbox_main.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 126 ++------------------------ 4 files changed, 14 insertions(+), 127 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.h +2 -8
@@ -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,9 +74,7 @@ struct vbox_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct mutex hw_mutex;/* protects modeset and accel/vbva accesses */ struct work_struct hotplug_work;
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -2
@@ -283,7 +283,7 @@ 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->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -301,7 +301,7 @@ int vbox_dumb_create(struct drm_file *file, {struct vbox_private *vbox = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &vbox->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &vbox->vmm.bdev,0 , false, args); }
drivers/gpu/drm/vboxvideo/vbox_ttm.c +9 -117
162 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v2 15/17 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.
v2:
* implement vbox_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/vboxvideo/Kconfig | 1 + drivers/gpu/drm/vboxvideo/vbox_drv.h | 10 +- drivers/gpu/drm/vboxvideo/vbox_main.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 126 ++------------------------ 4 files changed, 14 insertions(+), 127 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.h +2 -8
@@ -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,9 +74,7 @@ struct vbox_private {int fb_mtrr; -struct { -struct ttm_bo_device bdev; - } ttm; +struct drm_vram_mm vmm;struct mutex hw_mutex;/* protects modeset and accel/vbva accesses */ struct work_struct hotplug_work;
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -2
@@ -283,7 +283,7 @@ 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->vmm.bdev, size,0 , false);if (IS_ERR (gbo)) { ret =PTR_ERR (gbo);if (ret != -ERESTARTSYS )
@@ -301,7 +301,7 @@ int vbox_dumb_create(struct drm_file *file, {struct vbox_private *vbox = dev->dev_private; -return drm_gem_vram_fill_create_dumb (file, dev, &vbox->ttm.bdev,0 , +return drm_gem_vram_fill_create_dumb (file, dev, &vbox->vmm.bdev,0 , false, args); }
drivers/gpu/drm/vboxvideo/vbox_ttm.c +9 -117
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 v2 16/17 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 v2 16/17 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 v2 17/17 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.
v2:
* implement hibmc_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 7 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 125 ++---------------- 3 files changed, 14 insertions(+), 119 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.h +3 -4
@@ -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,9 +49,8 @@ struct hibmc_drm_private {struct drm_device *dev;bool mode_config_initialized; -/* ttm */ -struct ttm_bo_device bdev; -bool initialized; +/* vram */ +struct drm_vram_mm vmm;/* fbdev */ struct hibmc_fbdev *fbdev;
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -115
160 lines not on this page · raw message
Signature · 1 line
2.21.0
Thomas Zimmermann
maintainerPATCH v2 17/17 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.
v2:
* implement hibmc_mmap() with drm_vram_mm_mmap()
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 7 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 125 ++---------------- 3 files changed, 14 insertions(+), 119 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.h +3 -4
@@ -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,9 +49,8 @@ struct hibmc_drm_private {struct drm_device *dev;bool mode_config_initialized; -/* ttm */ -struct ttm_bo_device bdev; -bool initialized; +/* vram */ +struct drm_vram_mm vmm;/* fbdev */ struct hibmc_fbdev *fbdev;
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +10 -115
160 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
Quoted 31 lines · Thomas Zimmermann
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.
Quoted 10 lines
v2:
* rename |struct drm_gem_ttm_object| to |struct drm_gem_vram_object|
* rename |struct drm_simple_ttm| to |struct drm_vram_mm|
* makedrm_is_gem_ttm()an internal helper
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* adddrm_vram_mm_mmap()helper
* replace almost all of driver's TTM code with these helpers
* documentation fixes
I think this looks greats. A bunch of small ideas as replies how to futher streamline/simplify the helper api. But since I'm not a vram/ttm/gem helper expert really I think I'll leave final review/merging to others. I think there's enough interest in your work to make that work smoothly, if not pls pipe up.
Cheers, Daniel
Quoted 75 lines
Thomas Zimmermann (17):
drm: Add |struct drm_gem_vram_object| and helpers drm: Add |struct drm_gem_vram_object| callbacks for |structttm_bo_driver|
drm: Add |struct drm_gem_vram_object| callbacks for |struct
drm_driver|
drm: Adddrm_gem_vram_fill_create_dumb()to create dumb buffers
drm: Add VRAM MM, a simple memory manager for dedicated VRAM 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 MMDocumentation/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 | 4 +- drivers/gpu/drm/ast/ast_drv.h | 65 +- drivers/gpu/drm/ast/ast_fb.c | 30 +- drivers/gpu/drm/ast/ast_main.c | 74 +-- drivers/gpu/drm/ast/ast_mode.c | 124 ++-- drivers/gpu/drm/ast/ast_ttm.c | 293 +-------- drivers/gpu/drm/bochs/Kconfig | 2 + drivers/gpu/drm/bochs/bochs.h | 45 +- drivers/gpu/drm/bochs/bochs_drv.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 395 +----------- drivers/gpu/drm/drm_gem_vram_helper.c | 570 ++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + drivers/gpu/drm/drm_vram_mm_helper.c | 210 +++++++ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + .../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 | 32 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 329 +--------- drivers/gpu/drm/mgag200/Kconfig | 2 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 88 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 74 +-- drivers/gpu/drm/mgag200/mgag200_fb.c | 30 +- drivers/gpu/drm/mgag200/mgag200_main.c | 84 +-- drivers/gpu/drm/mgag200/mgag200_mode.c | 52 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 293 +-------- drivers/gpu/drm/vboxvideo/Kconfig | 2 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 68 +-- 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 | 347 +---------- include/drm/drm_gem_vram_helper.h | 120 ++++ include/drm/drm_vram_mm_helper.h | 67 ++ 41 files changed, 1445 insertions(+), 2231 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 31 lines · Thomas Zimmermann
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.
Quoted 10 lines
v2:
* rename |struct drm_gem_ttm_object| to |struct drm_gem_vram_object|
* rename |struct drm_simple_ttm| to |struct drm_vram_mm|
* makedrm_is_gem_ttm()an internal helper
* adddrm_gem_vram_kmap_at()
* returnis_iomemfrom kmap functions
* redefine TTM placement flags for public interface
* adddrm_vram_mm_mmap()helper
* replace almost all of driver's TTM code with these helpers
* documentation fixes
I think this looks greats. A bunch of small ideas as replies how to futher streamline/simplify the helper api. But since I'm not a vram/ttm/gem helper expert really I think I'll leave final review/merging to others. I think there's enough interest in your work to make that work smoothly, if not pls pipe up.
Cheers, Daniel
Quoted 75 lines
Thomas Zimmermann (17):
drm: Add |struct drm_gem_vram_object| and helpers drm: Add |struct drm_gem_vram_object| callbacks for |structttm_bo_driver|
drm: Add |struct drm_gem_vram_object| callbacks for |struct
drm_driver|
drm: Adddrm_gem_vram_fill_create_dumb()to create dumb buffers
drm: Add VRAM MM, a simple memory manager for dedicated VRAM 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 MMDocumentation/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 | 4 +- drivers/gpu/drm/ast/ast_drv.h | 65 +- drivers/gpu/drm/ast/ast_fb.c | 30 +- drivers/gpu/drm/ast/ast_main.c | 74 +-- drivers/gpu/drm/ast/ast_mode.c | 124 ++-- drivers/gpu/drm/ast/ast_ttm.c | 293 +-------- drivers/gpu/drm/bochs/Kconfig | 2 + drivers/gpu/drm/bochs/bochs.h | 45 +- drivers/gpu/drm/bochs/bochs_drv.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 18 +- drivers/gpu/drm/bochs/bochs_mm.c | 395 +----------- drivers/gpu/drm/drm_gem_vram_helper.c | 570 ++++++++++++++++++ drivers/gpu/drm/drm_vram_helper_common.c | 6 + drivers/gpu/drm/drm_vram_mm_helper.c | 210 +++++++ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + .../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 | 32 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 30 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 329 +--------- drivers/gpu/drm/mgag200/Kconfig | 2 + drivers/gpu/drm/mgag200/mgag200_cursor.c | 88 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 74 +-- drivers/gpu/drm/mgag200/mgag200_fb.c | 30 +- drivers/gpu/drm/mgag200/mgag200_main.c | 84 +-- drivers/gpu/drm/mgag200/mgag200_mode.c | 52 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 293 +-------- drivers/gpu/drm/vboxvideo/Kconfig | 2 + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 68 +-- 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 | 347 +---------- include/drm/drm_gem_vram_helper.h | 120 ++++ include/drm/drm_vram_mm_helper.h | 67 ++ 41 files changed, 1445 insertions(+), 2231 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
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