Provide vmap/vunmap for VRAM helpers
Subsystems (4)
Thomas Zimmermann
maintainercover Provide vmap/vunmap for VRAM helpers
The vmap operation is pin+kmap, as already implemented for PRIME support. The vunmap operation is the inverse. This patch set makes both available for drivers that use VRAM helpers, and replaces the respective code in ast and mgag200.
Thomas Zimmermann (3):
drm/vram: Provide vmap and vunmap operations for GEM VRAM objects drm/ast: Use drm_gem_vram_{vmap,vunmap}() to map cursor source BO drm/mgag200: Use drm_gem_vram_{vmap,vunmap}() to map cursor source BO
drivers/gpu/drm/ast/ast_mode.c | 21 +++------ drivers/gpu/drm/drm_gem_vram_helper.c | 55 +++++++++++++++++++----- drivers/gpu/drm/mgag200/mgag200_cursor.c | 22 +++------- include/drm/drm_gem_vram_helper.h | 12 ++++++ 4 files changed, 71 insertions(+), 39 deletions(-)
--
2.22.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 1/3 drm/vram: Provide vmap and vunmap operations for GEM VRAM objects
The pattern of temporarily pinning and kmap-ing the BO's memory is common enough to justify helper functions that do and undo these operations.
The implementation of vmap and vunmap for GEM VRAM helpers is already in PRIME helpers. The patch moves the operations to separate functions and exports them for general use.
The patch also adds a note about possible kmap counting. So far this isn't required by drivers, but more complex use cases might make it necessary.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 55 ++++++++++++++++++++++----- include/drm/drm_gem_vram_helper.h | 12 ++++++ 2 files changed, 57 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +45 -10
@@ -340,6 +340,48 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_kunmap); +/** +* drm_gem_vram_vmap() - Pins and maps a GEM VRAM object into kernel address +space +* @gem: The GEM VRAM object to map +* +* The vmap function pins a GEM VRAM object to it's current location, either +* system or video memory, and maps it's buffer into kernel address space. As +* pinned object cannot be reloacted, you should not permanently pin objects. +* +* Returns: +* The buffer's virtual address on success, or +* an ERR_PTR()-encoded error code otherwise. +*/ +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo) +{ +int ret; +void *base; + + ret =drm_gem_vram_pin (gbo,0 ); +if (ret) +return ERR_PTR (ret); + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { +drm_gem_vram_unpin (gbo); +return base; + } +return base; +} +EXPORT_SYMBOL (drm_gem_vram_vmap); + +/** +* drm_gem_vram_vunmap() - Unmaps and unpins a GEM VRAM object +* @gem: The GEM VRAM object to unmap +* @vaddr: The mapping's base address +*/ +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr) +{ +drm_gem_vram_kunmap (gbo); +drm_gem_vram_unpin (gbo); +} +EXPORT_SYMBOL (drm_gem_vram_vunmap); +/** * drm_gem_vram_fill_create_dumb() - \ Helper for implementing &struct drm_driver.dumb_create
@@ -595,17 +637,11 @@ static void drm_gem_vram_object_unpin(struct drm_gem_object *gem)static void *drm_gem_vram_object_vmap (struct drm_gem_object *gem) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -int ret;void *base; - ret =drm_gem_vram_pin (gbo,0 ); -if (ret) + base =drm_gem_vram_vmap (gbo); +if (IS_ERR (base))return NULL ; - base =drm_gem_vram_kmap (gbo, true,NULL ); -if (IS_ERR (base)) { -drm_gem_vram_unpin (gbo); -return NULL ; - }return base; }
@@ -620,8 +656,7 @@ static void drm_gem_vram_object_vunmap(struct drm_gem_object *gem, {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -drm_gem_vram_kunmap (gbo); -drm_gem_vram_unpin (gbo); +drm_gem_vram_vunmap (gbo, vaddr); }/*
include/drm/drm_gem_vram_helper.h +12 -0
@@ -44,6 +44,16 @@ struct drm_gem_vram_object {struct ttm_placement placement;struct ttm_place placements[2 ]; +/* TODO: Maybe implement a map counter. +* +* So far, drivers based on VRAM helpers don't have overlapping +* mapping operations. A driver temporarily maps an object and +* unmaps it ASAP. This works well for fbdev emulation or cursors. +* +* If we ever have a driver with buffer objects that are mapped +* by multiple code fragments concurrently, we may need a map +* counter to get the mapping right. +*/ int pin_count; };
@@ -84,6 +94,8 @@ int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);void *drm_gem_vram_kmap (struct drm_gem_vram_object *gbo,bool map,bool *is_iomem);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo); +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr); int drm_gem_vram_fill_create_dumb(struct drm_file *file, struct drm_device *dev,
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm/vram: Provide vmap and vunmap operations for GEM VRAM objects
Quoted 24 lines · Thomas Zimmermann
The pattern of temporarily pinning and kmap-ing the BO's memory is common enough to justify helper functions that do and undo these operations.
The implementation of vmap and vunmap for GEM VRAM helpers is already in PRIME helpers. The patch moves the operations to separate functions and exports them for general use.
The patch also adds a note about possible kmap counting. So far this isn't required by drivers, but more complex use cases might make it necessary.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 55 ++++++++++++++++++++++----- include/drm/drm_gem_vram_helper.h | 12 ++++++ 2 files changed, 57 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_gem_vram_helper.c +0
-0
drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 346
Quoted 7 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0@@ -340,6 +340,48 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_kunmap); +/** +* drm_gem_vram_vmap() - Pins and maps a GEM VRAM object into kernel address +space +* @gem: The GEM VRAM object to map
variable names need to match, kernel-doc should be complaining here.
drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 350
Quoted 4 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0+* +* The vmap function pins a GEM VRAM object to it's current location, either +* system or video memory, and maps it's buffer into kernel address space. As +* pinned object cannot be reloacted, you should not permanently pin objects.
Imo also good to point at the corresponding functions, i.e. reference unmap here and in the unmap function reference the map function. And please make sure the links work in the generated doc output.
Quoted 72 lines
drivers/gpu/drm/drm_gem_vram_helper.c +37
-10+* +* Returns: +* The buffer's virtual address on success, or +* an ERR_PTR()-encoded error code otherwise. +*/ +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo) +{ +int ret; +void *base; + + ret =drm_gem_vram_pin (gbo,0 ); +if (ret) +return ERR_PTR (ret); + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { +drm_gem_vram_unpin (gbo); +return base; + } +return base; +} +EXPORT_SYMBOL (drm_gem_vram_vmap); + +/** +* drm_gem_vram_vunmap() - Unmaps and unpins a GEM VRAM object +* @gem: The GEM VRAM object to unmap +* @vaddr: The mapping's base address +*/ +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr) +{ +drm_gem_vram_kunmap (gbo); +drm_gem_vram_unpin (gbo); +} +EXPORT_SYMBOL (drm_gem_vram_vunmap); +/** * drm_gem_vram_fill_create_dumb() - \ Helper for implementing &struct drm_driver.dumb_create @@ -595,17 +637,11 @@ static void drm_gem_vram_object_unpin(struct drm_gem_object *gem)static void *drm_gem_vram_object_vmap (struct drm_gem_object *gem) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -int ret;void *base; - ret =drm_gem_vram_pin (gbo,0 ); -if (ret) + base =drm_gem_vram_vmap (gbo); +if (IS_ERR (base))return NULL ; - base =drm_gem_vram_kmap (gbo, true,NULL ); -if (IS_ERR (base)) { -drm_gem_vram_unpin (gbo); -return NULL ; - }return base; }@@ -620,8 +656,7 @@ static void drm_gem_vram_object_vunmap(struct drm_gem_object *gem, {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -drm_gem_vram_kunmap (gbo); -drm_gem_vram_unpin (gbo); +drm_gem_vram_vunmap (gbo, vaddr); }/* include/drm/drm_gem_vram_helper.h +0
-0
include/drm/drm_gem_vram_helper.h struct drm_gem_vram_object { · line 47
Quoted 4 lines
include/drm/drm_gem_vram_helper.h +1
-0@@ -44,6 +44,16 @@ struct drm_gem_vram_object {struct ttm_placement placement;struct ttm_place placements[2 ]; +/* TODO: Maybe implement a map counter.
Kerneldoc is missing here. You can use the inline style so that the todo comment here is still included.
-Daniel
Quoted 24 lines
include/drm/drm_gem_vram_helper.h +11
-1+* +* So far, drivers based on VRAM helpers don't have overlapping +* mapping operations. A driver temporarily maps an object and +* unmaps it ASAP. This works well for fbdev emulation or cursors. +* +* If we ever have a driver with buffer objects that are mapped +* by multiple code fragments concurrently, we may need a map +* counter to get the mapping right. +*/ int pin_count; };@@ -84,6 +94,8 @@ int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);void *drm_gem_vram_kmap (struct drm_gem_vram_object *gbo,bool map,bool *is_iomem);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo); +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr); int drm_gem_vram_fill_create_dumb(struct drm_file *file, struct drm_device *dev, --2.22.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 1/3] drm/vram: Provide vmap and vunmap operations for GEM VRAM objects
Hi
Am 24.07.19 um 14:00 schrieb Daniel Vetter:
Quoted 119 lines · Thomas Zimmermann
Quoted 24 lines
The pattern of temporarily pinning and kmap-ing the BO's memory is common enough to justify helper functions that do and undo these operations.
The implementation of vmap and vunmap for GEM VRAM helpers is already in PRIME helpers. The patch moves the operations to separate functions and exports them for general use.
The patch also adds a note about possible kmap counting. So far this isn't required by drivers, but more complex use cases might make it necessary.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 55 ++++++++++++++++++++++----- include/drm/drm_gem_vram_helper.h | 12 ++++++ 2 files changed, 57 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_gem_vram_helper.c +0
-0drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 346
Quoted 7 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0@@ -340,6 +340,48 @@ void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_kunmap); +/** +* drm_gem_vram_vmap() - Pins and maps a GEM VRAM object into kernel address +space +* @gem: The GEM VRAM object to map variable names need to match, kernel-doc should be complaining here.
drivers/gpu/drm/drm_gem_vram_helper.c void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo) · line 350
Quoted 4 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0+* +* The vmap function pins a GEM VRAM object to it's current location, either +* system or video memory, and maps it's buffer into kernel address space. As +* pinned object cannot be reloacted, you should not permanently pin objects. Imo also good to point at the corresponding functions, i.e. reference unmap here and in the unmap function reference the map function. And please make sure the links work in the generated doc output.
Quoted 75 lines
drivers/gpu/drm/drm_gem_vram_helper.c +37
-10+* +* Returns: +* The buffer's virtual address on success, or +* an ERR_PTR()-encoded error code otherwise. +*/ +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo) +{ +int ret; +void *base; + + ret =drm_gem_vram_pin (gbo,0 ); +if (ret) +return ERR_PTR (ret); + base =drm_gem_vram_kmap (gbo, true,NULL ); +if (IS_ERR (base)) { +drm_gem_vram_unpin (gbo); +return base; + } +return base; +} +EXPORT_SYMBOL (drm_gem_vram_vmap); + +/** +* drm_gem_vram_vunmap() - Unmaps and unpins a GEM VRAM object +* @gem: The GEM VRAM object to unmap +* @vaddr: The mapping's base address +*/ +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr) +{ +drm_gem_vram_kunmap (gbo); +drm_gem_vram_unpin (gbo); +} +EXPORT_SYMBOL (drm_gem_vram_vunmap); +/** * drm_gem_vram_fill_create_dumb() - \ Helper for implementing &struct drm_driver.dumb_create @@ -595,17 +637,11 @@ static void drm_gem_vram_object_unpin(struct drm_gem_object *gem)static void *drm_gem_vram_object_vmap (struct drm_gem_object *gem) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -int ret;void *base; - ret =drm_gem_vram_pin (gbo,0 ); -if (ret) + base =drm_gem_vram_vmap (gbo); +if (IS_ERR (base))return NULL ; - base =drm_gem_vram_kmap (gbo, true,NULL ); -if (IS_ERR (base)) { -drm_gem_vram_unpin (gbo); -return NULL ; - }return base; }@@ -620,8 +656,7 @@ static void drm_gem_vram_object_vunmap(struct drm_gem_object *gem, {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem); -drm_gem_vram_kunmap (gbo); -drm_gem_vram_unpin (gbo); +drm_gem_vram_vunmap (gbo, vaddr); }/* include/drm/drm_gem_vram_helper.h +0
-0@@ -44,6 +44,16 @@ struct drm_gem_vram_object {struct ttm_placement placement;struct ttm_place placements[2 ];
Quoted 5 lines
include/drm/drm_gem_vram_helper.h struct drm_gem_vram_object { · line 47
Quoted 1 line
include/drm/drm_gem_vram_helper.h +1
-0+/* TODO: Maybe implement a map counter. Kerneldoc is missing here. You can use the inline style so that the todo comment here is still included.
-Daniel
Actually, this comment wasn't intended to be in the kernel docs. I guess I integrate it into the structure's overall documentation then.
Best regards
Thomas
Quoted 26 lines
Quoted 24 lines
include/drm/drm_gem_vram_helper.h +11
-1+* +* So far, drivers based on VRAM helpers don't have overlapping +* mapping operations. A driver temporarily maps an object and +* unmaps it ASAP. This works well for fbdev emulation or cursors. +* +* If we ever have a driver with buffer objects that are mapped +* by multiple code fragments concurrently, we may need a map +* counter to get the mapping right. +*/ int pin_count; };@@ -84,6 +94,8 @@ int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);void *drm_gem_vram_kmap (struct drm_gem_vram_object *gbo,bool map,bool *is_iomem);void drm_gem_vram_kunmap (struct drm_gem_vram_object *gbo); +void *drm_gem_vram_vmap (struct drm_gem_vram_object *gbo); +void drm_gem_vram_vunmap (struct drm_gem_vram_object *gbo,void *vaddr); int drm_gem_vram_fill_create_dumb(struct drm_file *file, struct drm_device *dev, --2.22.0
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 2/3 drm/ast: Use drm_gem_vram_{vmap, vunmap}() to map cursor source BO
In reply to Thomas ZimmermannThe VRAM helper's vmap interfaces provide pinning and mapping of BO memory. This patch replaces the respective code in ast cursor handling.
--- drivers/gpu/drm/ast/ast_mode.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +7 -14
@@ -1176,26 +1176,22 @@ static int ast_cursor_set(struct drm_crtc *crtc,return -ENOENT ; } gbo =drm_gem_vram_of_gem (obj); - - ret =drm_gem_vram_pin (gbo,0 ); -if (ret) - goto err_drm_gem_object_put_unlocked; - src =drm_gem_vram_kmap (gbo, true,NULL ); + src =drm_gem_vram_vmap (gbo);if (IS_ERR (src)) { ret =PTR_ERR (src); - goto err_drm_gem_vram_unpin; + goto err_drm_gem_object_put_unlocked; } dst =drm_gem_vram_kmap (drm_gem_vram_of_gem (ast->cursor_cache), false,NULL );if (IS_ERR (dst)) { ret =PTR_ERR (dst); - goto err_drm_gem_vram_kunmap; + goto err_drm_gem_vram_vunmap; } dst_gpu =drm_gem_vram_offset (drm_gem_vram_of_gem (ast->cursor_cache));if (dst_gpu <0 ) { ret = (int )dst_gpu; - goto err_drm_gem_vram_kunmap; + goto err_drm_gem_vram_vunmap; } dst += (AST_HWC_SIZE +AST_HWC_SIGNATURE_SIZE )*ast->next_cursor;
@@ -1230,16 +1226,13 @@ static int ast_cursor_set(struct drm_crtc *crtc,ast_show_cursor (crtc); -drm_gem_vram_kunmap (gbo); -drm_gem_vram_unpin (gbo); +drm_gem_vram_vunmap (gbo, src);drm_gem_object_put_unlocked (obj);return 0 ; -err_drm_gem_vram_kunmap: -drm_gem_vram_kunmap (gbo); -err_drm_gem_vram_unpin: -drm_gem_vram_unpin (gbo); +err_drm_gem_vram_vunmap: +drm_gem_vram_vunmap (gbo, src); err_drm_gem_object_put_unlocked:drm_gem_object_put_unlocked (obj);return ret;
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 3/3 drm/mgag200: Use drm_gem_vram_{vmap, vunmap}() to map cursor source BO
In reply to Thomas ZimmermannThe VRAM helper's vmap interfaces provide pinning and mapping of BO memory. This patch replaces the respective code in mgag200 cursor handling.
--- drivers/gpu/drm/mgag200/mgag200_cursor.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/gpu/drm/mgag200/mgag200_cursor.c +7 -15
@@ -85,17 +85,12 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,if (!obj)return -ENOENT ; gbo =drm_gem_vram_of_gem (obj); - ret =drm_gem_vram_pin (gbo,0 ); -if (ret) { -dev_err (&dev->pdev->dev,"failed to lock user bo\n" ); - goto err_drm_gem_object_put_unlocked; - } - src =drm_gem_vram_kmap (gbo, true,NULL ); + src =drm_gem_vram_vmap (gbo);if (IS_ERR (src)) { ret =PTR_ERR (src);dev_err (&dev->pdev->dev, -"failed to kmap user buffer updates\n" ); - goto err_drm_gem_vram_unpin_src; +"failed to map user buffer updates\n" ); + goto err_drm_gem_object_put_unlocked; }/* Pin and map up-coming buffer to write colour indices */
@@ -103,7 +98,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,if (ret) {dev_err (&dev->pdev->dev,"failed to pin cursor buffer: %d\n" , ret); - goto err_drm_gem_vram_kunmap_src; + goto err_drm_gem_vram_vunmap; } dst =drm_gem_vram_kmap (pixels_next, true,NULL );if (IS_ERR (dst)) {
@@ -213,8 +208,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, mdev->cursor.pixels_current = pixels_next;drm_gem_vram_kunmap (pixels_next); -drm_gem_vram_kunmap (gbo); -drm_gem_vram_unpin (gbo); +drm_gem_vram_vunmap (gbo, src);drm_gem_object_put_unlocked (obj);return 0 ;
@@ -223,10 +217,8 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,drm_gem_vram_kunmap (pixels_next); err_drm_gem_vram_unpin_dst:drm_gem_vram_unpin (pixels_next); -err_drm_gem_vram_kunmap_src: -drm_gem_vram_kunmap (gbo); -err_drm_gem_vram_unpin_src: -drm_gem_vram_unpin (gbo); +err_drm_gem_vram_vunmap: +drm_gem_vram_vunmap (gbo, src); err_drm_gem_object_put_unlocked:drm_gem_object_put_unlocked (obj);return ret;
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel