Skip to contentSkip to conversation

drm/virtio: improve prime support.

PATCH In review Gerd Hoffmann 2 participants 13 messages Feb 27, 2019

Subsystems (4)
lore
Share & tools
lore

Gerd Hoffmann

author maintainer
#0 lore raw

cover 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
author maintainer
#1 lore raw

PATCH 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
index c59ec34c80a5..b4c9199349e7 100644
@@ -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
Acked-by on v1 1/3
#2 lore raw

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 call drm_gem_prime_mmap().

---

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Acked-by on v1 1/3
#3 lore raw

Re: [PATCH 1/3] drm/virtio: implement prime mmap

In reply to Gerd Hoffmann

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 call drm_gem_prime_mmap().

---

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#4 lore raw

PATCH 1/3 drm/virtio: implement prime mmap

In reply to Gerd Hoffmann

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
index c59ec34c80a5..b4c9199349e7 100644
@@ -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
author maintainer
#5 lore raw

PATCH 2/3 drm/virtio: implement prime pin/unpin

In reply to Gerd Hoffmann

virtio-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
index b4c9199349e7..0fcae0e46abd 100644
@@ -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
Reviewed-by on v1 2/3
#6 lore raw

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 ;)

---
 drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +0 -1
index b4c9199349e7..0fcae0e46abd 100644
@@ -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 -0
 void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj)
 

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reviewed-by on v1 2/3
#7 lore raw

Re: [PATCH 2/3] drm/virtio: implement prime pin/unpin

In reply to Gerd Hoffmann

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 ;)

---
 drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_prime.c +0 -1
index b4c9199349e7..0fcae0e46abd 100644
@@ -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 -0
 void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj)
 

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#8 lore raw

PATCH 2/3 drm/virtio: implement prime pin/unpin

In reply to Gerd Hoffmann

virtio-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
index b4c9199349e7..0fcae0e46abd 100644
@@ -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
author maintainer
#9 lore raw

PATCH 3/3 drm/virtio: implement prime export

In reply to Gerd Hoffmann

Just 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
index 3238fdf58eb4..fb1095fa873f 100644
@@ -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
index b996ac1d4fcc..4f4f578752fa 100644
@@ -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
index 0fcae0e46abd..1fe593e391b5 100644
@@ -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
author maintainer
#10 lore raw

PATCH 3/3 drm/virtio: implement prime export

In reply to Gerd Hoffmann

Just 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
index 3238fdf58eb4..fb1095fa873f 100644
@@ -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
index b996ac1d4fcc..4f4f578752fa 100644
@@ -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
index 0fcae0e46abd..1fe593e391b5 100644
@@ -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
Acked-by on v1 3/3
#11 lore raw

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 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.

Acked-by on v1 3/3
#12 lore raw

Re: [PATCH 3/3] drm/virtio: implement prime export

In reply to Gerd Hoffmann

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 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.

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization