drm/virtio: improve prime support.
Subsystems (4)
Gerd Hoffmann
maintainercover drm/virtio: improve prime support.
Gerd Hoffmann (3):
drm/virtio: implement prime mmap
drm/virtio: implement prime pin/unpin
drm/virtio: implement prime export
drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 ++ drivers/gpu/drm/virtio/virtgpu_prime.c | 25 ++++++++++++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/3 drm/virtio: implement prime mmap
Sync gem vm_node.start with ttm vm_node.start,
then we can just call drm_gem_prime_mmap().
--- drivers/gpu/drm/virtio/virtgpu_prime.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +5 -2
@@ -56,7 +56,10 @@ void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }int virtgpu_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *area) +struct vm_area_struct *vma) { -return -ENODEV ; +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); + + bo->gem_base.vma_node.vm_node.start = bo->tbo.vma_node.vm_node.start; +return drm_gem_prime_mmap (obj, vma); }
Signature · 1 line
2.9.3
Re: [PATCH 1/3] drm/virtio: implement prime mmap
Den 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 5 lines
Sync gem vm_node.start with ttm vm_node.start,
then we can just calldrm_gem_prime_mmap().Signed-off-by Gerd Hoffmann <[email protected]>---
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 1/3] drm/virtio: implement prime mmap
In reply to Gerd HoffmannDen 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 5 lines
Sync gem vm_node.start with ttm vm_node.start,
then we can just calldrm_gem_prime_mmap().Signed-off-by Gerd Hoffmann <[email protected]>---
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/3 drm/virtio: implement prime mmap
In reply to Gerd HoffmannSync gem vm_node.start with ttm vm_node.start,
then we can just call drm_gem_prime_mmap().
--- drivers/gpu/drm/virtio/virtgpu_prime.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +5 -2
@@ -56,7 +56,10 @@ void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) }int virtgpu_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *area) +struct vm_area_struct *vma) { -return -ENODEV ; +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); + + bo->gem_base.vma_node.vm_node.start = bo->tbo.vma_node.vm_node.start; +return drm_gem_prime_mmap (obj, vma); }
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 2/3 drm/virtio: implement prime pin/unpin
In reply to Gerd Hoffmannvirtio-gpu objects never move around, so effectively they are pinned all the time. This makes the the implementation pretty easy ;)
--- drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +3 -3
@@ -30,13 +30,13 @@int virtgpu_gem_prime_pin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); -return -ENODEV ; +/* nothing: all virtio-gpu objects are pinned all the time */ +return 0 ; }void virtgpu_gem_prime_unpin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); +/* nothing */ }void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj)
Signature · 1 line
2.9.3
Re: [PATCH 2/3] drm/virtio: implement prime pin/unpin
Den 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 17 lines
virtio-gpu objects never move around, so effectively they are pinned all the time. This makes the the implementation pretty easy ;)
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/virtio/virtgpu_prime.c +0
-1@@ -30,13 +30,13 @@int virtgpu_gem_prime_pin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" );
drivers/gpu/drm/virtio/virtgpu_prime.c line 40
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +3
-2-return -ENODEV ; +/* nothing: all virtio-gpu objects are pinned all the time */ +return 0 ; }void virtgpu_gem_prime_unpin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); +/* nothing */ }
You can just remove these dummies the callbacks are optional. See drm_gem_pin().
With that:
drivers/gpu/drm/virtio/virtgpu_prime.c line 42
Quoted 3 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +0
-0void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 2/3] drm/virtio: implement prime pin/unpin
In reply to Gerd HoffmannDen 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 17 lines
virtio-gpu objects never move around, so effectively they are pinned all the time. This makes the the implementation pretty easy ;)
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/virtio/virtgpu_prime.c +0
-1@@ -30,13 +30,13 @@int virtgpu_gem_prime_pin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" );
drivers/gpu/drm/virtio/virtgpu_prime.c line 40
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +3
-2-return -ENODEV ; +/* nothing: all virtio-gpu objects are pinned all the time */ +return 0 ; }void virtgpu_gem_prime_unpin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); +/* nothing */ }
You can just remove these dummies the callbacks are optional. See drm_gem_pin().
With that:
drivers/gpu/drm/virtio/virtgpu_prime.c line 42
Quoted 3 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +0
-0void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 2/3 drm/virtio: implement prime pin/unpin
In reply to Gerd Hoffmannvirtio-gpu objects never move around, so effectively they are pinned all the time. This makes the the implementation pretty easy ;)
--- drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +3 -3
@@ -30,13 +30,13 @@int virtgpu_gem_prime_pin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); -return -ENODEV ; +/* nothing: all virtio-gpu objects are pinned all the time */ +return 0 ; }void virtgpu_gem_prime_unpin (struct drm_gem_object *obj) { -WARN_ONCE (1 ,"not implemented" ); +/* nothing */ }void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj)
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 3/3 drm/virtio: implement prime export
In reply to Gerd HoffmannJust run drm_prime_pages_to_sg() on the ttm pages list to get an sg_table for export. The pages list is created at object initialization time, so there should be no need to handle an unpopulated page list. Add a sanity check nevertheless.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 ++ drivers/gpu/drm/virtio/virtgpu_prime.c | 12 ++++++++++++ 3 files changed, 15 insertions(+)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -354,6 +354,7 @@ int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait);/* virtgpu_prime.c */ int virtgpu_gem_prime_pin (struct drm_gem_object *obj);void virtgpu_gem_prime_unpin (struct drm_gem_object *obj); +struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj);void virtgpu_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,
drivers/gpu/drm/virtio/virtgpu_drv.c +2 -0
@@ -205,10 +205,12 @@ static struct drm_driver driver = { #if defined(CONFIG_DEBUG_FS) .debugfs_init = virtio_gpu_debugfs_init, #endif + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, .gem_prime_pin = virtgpu_gem_prime_pin, .gem_prime_unpin = virtgpu_gem_prime_unpin, + .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table, .gem_prime_vmap = virtgpu_gem_prime_vmap, .gem_prime_vunmap = virtgpu_gem_prime_vunmap, .gem_prime_mmap = virtgpu_gem_prime_mmap,
drivers/gpu/drm/virtio/virtgpu_prime.c +12 -0
@@ -39,6 +39,18 @@ void virtgpu_gem_prime_unpin(struct drm_gem_object *obj)/* nothing */ } +struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj) +{ +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); + +if (!bo->tbo.ttm->pages || !bo->tbo.ttm->num_pages) +/* should not happen */ +return ERR_PTR (-EINVAL ); + +return drm_prime_pages_to_sg (bo->tbo.ttm->pages, + bo->tbo.ttm->num_pages); +} +void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj) {struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj);
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 3/3 drm/virtio: implement prime export
In reply to Gerd HoffmannJust run drm_prime_pages_to_sg() on the ttm pages list to get an sg_table for export. The pages list is created at object initialization time, so there should be no need to handle an unpopulated page list. Add a sanity check nevertheless.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 ++ drivers/gpu/drm/virtio/virtgpu_prime.c | 12 ++++++++++++ 3 files changed, 15 insertions(+)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -354,6 +354,7 @@ int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait);/* virtgpu_prime.c */ int virtgpu_gem_prime_pin (struct drm_gem_object *obj);void virtgpu_gem_prime_unpin (struct drm_gem_object *obj); +struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj);void virtgpu_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,
drivers/gpu/drm/virtio/virtgpu_drv.c +2 -0
@@ -205,10 +205,12 @@ static struct drm_driver driver = { #if defined(CONFIG_DEBUG_FS) .debugfs_init = virtio_gpu_debugfs_init, #endif + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, .gem_prime_pin = virtgpu_gem_prime_pin, .gem_prime_unpin = virtgpu_gem_prime_unpin, + .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table, .gem_prime_vmap = virtgpu_gem_prime_vmap, .gem_prime_vunmap = virtgpu_gem_prime_vunmap, .gem_prime_mmap = virtgpu_gem_prime_mmap,
drivers/gpu/drm/virtio/virtgpu_prime.c +12 -0
@@ -39,6 +39,18 @@ void virtgpu_gem_prime_unpin(struct drm_gem_object *obj)/* nothing */ } +struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj) +{ +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); + +if (!bo->tbo.ttm->pages || !bo->tbo.ttm->num_pages) +/* should not happen */ +return ERR_PTR (-EINVAL ); + +return drm_prime_pages_to_sg (bo->tbo.ttm->pages, + bo->tbo.ttm->num_pages); +} +void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj) {struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj);
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/3] drm/virtio: implement prime export
Den 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 6 lines
Just run
drm_prime_pages_to_sg()on the ttm pages list to get ansg_tablefor export. The pages list is created at object initialization time, so there should be no need to handle an unpopulated page list. Add a sanity check nevertheless.Signed-off-by Gerd Hoffmann <[email protected]>
Re: [PATCH 3/3] drm/virtio: implement prime export
In reply to Gerd HoffmannDen 27.02.2019 15.44, skrev Gerd Hoffmann:
Quoted 6 lines
Just run
drm_prime_pages_to_sg()on the ttm pages list to get ansg_tablefor export. The pages list is created at object initialization time, so there should be no need to handle an unpopulated page list. Add a sanity check nevertheless.Signed-off-by Gerd Hoffmann <[email protected]>
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization