drm/virtio: switch from ttm to gem shmem helpers.
Subsystems (4)
Gerd Hoffmann
maintainerv7 cover drm/virtio: switch from ttm to gem shmem helpers.
ttm increasingly gets into the way while hacking on virtio-gpu memory management. It also overkill for what virtio-gpu needs. Lets get rid of it.
v7:
- rebase to latest drm-misc-next
- reorder patches: switch all virtio commands to object array helpers first. then drop ttm, to make sure we don't release objects still in use.
- misc fixes.
v6:
- largely rewrite fencing logic, using the virtio_gpu_array_* helpers
- add more patches to the series.
v5:
- fence bugfixes.
- minor optimizations.
v4:
- make gem array helpers private to virtio.
- misc minor fixes.
v3:
- add gem array helpers.
- rework fencing.
cheers,
Gerd
Gerd Hoffmann (18):
drm/virtio: pass gem reservation object to ttm init drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper. drm/virtio: simplify cursor updates
drm/virtio: remove virtio_gpu_object_wait
drm/virtio: drop no_wait argument from virtio_gpu_object_reserve drm/virtio: remove ttm calls from in
virtio_gpu_object_{reserve,unreserve} drm/virtio: add virtio_gpu_object_array & helpers drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing drm/virtio: rework virtio_gpu_object_create fencing drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list drm/virtio: switch from ttm to gem shmem helpers drm/virtio: remove virtio_gpu_alloc_object
drm/virtio: drop virtio_gpu_object_{ref,unref}
drm/virtio: drop virtio_gpu_object_{reserve,unreserve} drm/virtio: add fence sanity check
drivers/gpu/drm/virtio/virtgpu_drv.h | 123 +++------- drivers/gpu/drm/virtio/virtgpu_drv.c | 20 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 4 + drivers/gpu/drm/virtio/virtgpu_gem.c | 157 ++++++++---- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 224 ++++++----------- drivers/gpu/drm/virtio/virtgpu_kms.c | 9 - drivers/gpu/drm/virtio/virtgpu_object.c | 220 +++++------------ drivers/gpu/drm/virtio/virtgpu_plane.c | 34 +-- drivers/gpu/drm/virtio/virtgpu_prime.c | 37 --- drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 ------------------------ drivers/gpu/drm/virtio/virtgpu_vq.c | 78 ++++-- drivers/gpu/drm/virtio/Kconfig | 2 +- drivers/gpu/drm/virtio/Makefile | 2 +- 13 files changed, 373 insertions(+), 842 deletions(-) delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 1/18 drm/virtio: pass gem reservation object to ttm init
With this gem and ttm will use the same reservation object, so mixing and matching ttm / gem reservation helpers should work fine.
--- drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_object.c +2 -1
@@ -132,7 +132,8 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,virtio_gpu_init_ttm_placement (bo); ret =ttm_bo_init (&vgdev->mman.bdev, &bo->tbo, params->size, ttm_bo_type_device, &bo->placement,0 , - true, acc_size,NULL ,NULL , + true, acc_size,NULL , + bo->gem_base.resv, &virtio_gpu_ttm_bo_destroy);/* ttm_bo_init failure will call the destroy */ if (ret !=0 )
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 1/18 drm/virtio: pass gem reservation object to ttm init
In reply to Gerd HoffmannWith this gem and ttm will use the same reservation object, so mixing and matching ttm / gem reservation helpers should work fine.
--- drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_object.c +2 -1
@@ -132,7 +132,8 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,virtio_gpu_init_ttm_placement (bo); ret =ttm_bo_init (&vgdev->mman.bdev, &bo->tbo, params->size, ttm_bo_type_device, &bo->placement,0 , - true, acc_size,NULL ,NULL , + true, acc_size,NULL , + bo->gem_base.resv, &virtio_gpu_ttm_bo_destroy);/* ttm_bo_init failure will call the destroy */ if (ret !=0 )
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 2/18 drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper.
In reply to Gerd HoffmannUse drm_gem_reservation_object_wait() in virtio_gpu_wait_ioctl(). This also makes the ioctl run lockless.
v5: handle lookup failure.
v2: use reservation_object_test_signaled_rcu for VIRTGPU_WAIT_NOWAIT.
--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 ++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +13 -15
@@ -466,23 +466,21 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) {struct drm_virtgpu_3d_wait *args = data; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct drm_gem_object *obj; +long timeout =15 *HZ ;int ret; -bool nowait = false; - gobj =drm_gem_object_lookup (file, args->handle); -if (gobj ==NULL ) -return -ENOENT ; - - qobj =gem_to_virtio_gpu_obj (gobj); - -if (args->flags &VIRTGPU_WAIT_NOWAIT ) - nowait = true; - ret =virtio_gpu_object_wait (qobj, nowait); - -drm_gem_object_put_unlocked (gobj); -return ret; +if (args->flags &VIRTGPU_WAIT_NOWAIT ) { + obj =drm_gem_object_lookup (file, args->handle); +if (obj ==NULL ) +return -ENOENT ; + ret =reservation_object_test_signaled_rcu (obj->resv, true); +drm_gem_object_put_unlocked (obj); +return ret ?0 : -EBUSY ; + } + +return drm_gem_reservation_object_wait (file, args->handle, + true, timeout); } static int virtio_gpu_get_caps_ioctl(struct drm_device *dev,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 2/18 drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper.
In reply to Gerd HoffmannUse drm_gem_reservation_object_wait() in virtio_gpu_wait_ioctl(). This also makes the ioctl run lockless.
v5: handle lookup failure.
v2: use reservation_object_test_signaled_rcu for VIRTGPU_WAIT_NOWAIT.
--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 ++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_ioctl.c +13 -15
@@ -466,23 +466,21 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) {struct drm_virtgpu_3d_wait *args = data; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct drm_gem_object *obj; +long timeout =15 *HZ ;int ret; -bool nowait = false; - gobj =drm_gem_object_lookup (file, args->handle); -if (gobj ==NULL ) -return -ENOENT ; - - qobj =gem_to_virtio_gpu_obj (gobj); - -if (args->flags &VIRTGPU_WAIT_NOWAIT ) - nowait = true; - ret =virtio_gpu_object_wait (qobj, nowait); - -drm_gem_object_put_unlocked (gobj); -return ret; +if (args->flags &VIRTGPU_WAIT_NOWAIT ) { + obj =drm_gem_object_lookup (file, args->handle); +if (obj ==NULL ) +return -ENOENT ; + ret =reservation_object_test_signaled_rcu (obj->resv, true); +drm_gem_object_put_unlocked (obj); +return ret ?0 : -EBUSY ; + } + +return drm_gem_reservation_object_wait (file, args->handle, + true, timeout); } static int virtio_gpu_get_caps_ioctl(struct drm_device *dev,
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 3/18 drm/virtio: simplify cursor updates
In reply to Gerd HoffmannNo need to do the reservation dance,
we can just wait on the fence directly.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +3 -10
@@ -186,7 +186,6 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,struct virtio_gpu_framebuffer *vgfb;struct virtio_gpu_object *bo =NULL ;uint32_t handle; -int ret =0 ;if (plane->state->crtc) output =drm_crtc_to_virtio_gpu_output (plane->state->crtc);
@@ -210,15 +209,9 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,cpu_to_le32 (plane->state->crtc_w),cpu_to_le32 (plane->state->crtc_h), 0, 0, vgfb->fence); - ret =virtio_gpu_object_reserve (bo, false); -if (!ret) { -reservation_object_add_excl_fence (bo->tbo.resv, - &vgfb->fence->f); -dma_fence_put (&vgfb->fence->f); - vgfb->fence =NULL ; -virtio_gpu_object_unreserve (bo); -virtio_gpu_object_wait (bo, false); - } +dma_fence_wait (&vgfb->fence->f, true); +dma_fence_put (&vgfb->fence->f); + vgfb->fence =NULL ; }if (plane->state->fb != old_state->fb) {
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 3/18 drm/virtio: simplify cursor updates
In reply to Gerd HoffmannNo need to do the reservation dance,
we can just wait on the fence directly.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +3 -10
@@ -186,7 +186,6 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,struct virtio_gpu_framebuffer *vgfb;struct virtio_gpu_object *bo =NULL ;uint32_t handle; -int ret =0 ;if (plane->state->crtc) output =drm_crtc_to_virtio_gpu_output (plane->state->crtc);
@@ -210,15 +209,9 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,cpu_to_le32 (plane->state->crtc_w),cpu_to_le32 (plane->state->crtc_h), 0, 0, vgfb->fence); - ret =virtio_gpu_object_reserve (bo, false); -if (!ret) { -reservation_object_add_excl_fence (bo->tbo.resv, - &vgfb->fence->f); -dma_fence_put (&vgfb->fence->f); - vgfb->fence =NULL ; -virtio_gpu_object_unreserve (bo); -virtio_gpu_object_wait (bo, false); - } +dma_fence_wait (&vgfb->fence->f, true); +dma_fence_put (&vgfb->fence->f); + vgfb->fence =NULL ; }if (plane->state->fb != old_state->fb) {
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 4/18 drm/virtio: remove virtio_gpu_object_wait
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 13 ------------- 2 files changed, 14 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -1
@@ -364,7 +364,6 @@ int virtio_gpu_object_kmap(struct virtio_gpu_object *bo);int virtio_gpu_object_get_sg_table (struct virtio_gpu_device *qdev,struct virtio_gpu_object *bo);void virtio_gpu_object_free_sg_table (struct virtio_gpu_object *bo); -int virtio_gpu_object_wait (struct virtio_gpu_object *bo,bool no_wait);/* virtgpu_prime.c */ struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);
drivers/gpu/drm/virtio/virtgpu_object.c +0 -13
@@ -233,16 +233,3 @@ void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo)kfree (bo->pages); bo->pages =NULL ; } - -int virtio_gpu_object_wait (struct virtio_gpu_object *bo,bool no_wait) -{ -int r; - - r =ttm_bo_reserve (&bo->tbo, true, no_wait,NULL ); -if (unlikely (r !=0 )) -return r; - r =ttm_bo_wait (&bo->tbo, true, no_wait); -ttm_bo_unreserve (&bo->tbo); -return r; -} -
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 4/18 drm/virtio: remove virtio_gpu_object_wait
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 13 ------------- 2 files changed, 14 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -1
@@ -364,7 +364,6 @@ int virtio_gpu_object_kmap(struct virtio_gpu_object *bo);int virtio_gpu_object_get_sg_table (struct virtio_gpu_device *qdev,struct virtio_gpu_object *bo);void virtio_gpu_object_free_sg_table (struct virtio_gpu_object *bo); -int virtio_gpu_object_wait (struct virtio_gpu_object *bo,bool no_wait);/* virtgpu_prime.c */ struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);
drivers/gpu/drm/virtio/virtgpu_object.c +0 -13
@@ -233,16 +233,3 @@ void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo)kfree (bo->pages); bo->pages =NULL ; } - -int virtio_gpu_object_wait (struct virtio_gpu_object *bo,bool no_wait) -{ -int r; - - r =ttm_bo_reserve (&bo->tbo, true, no_wait,NULL ); -if (unlikely (r !=0 )) -return r; - r =ttm_bo_wait (&bo->tbo, true, no_wait); -ttm_bo_unreserve (&bo->tbo); -return r; -} -
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 5/18 drm/virtio: drop no_wait argument from virtio_gpu_object_reserve
In reply to Gerd HoffmannAll callers pass no_wait = false.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 5 ++--- drivers/gpu/drm/virtio/virtgpu_gem.c | 4 ++-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -3
@@ -398,12 +398,11 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo)return drm_vma_node_offset_addr (&bo->tbo.vma_node); } -static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo, -bool no_wait) +static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) {int r; - r =ttm_bo_reserve (&bo->tbo, true, no_wait,NULL ); + r =ttm_bo_reserve (&bo->tbo, true, false,NULL );if (unlikely (r !=0 )) {if (r != -ERESTARTSYS ) { struct virtio_gpu_device *qdev =
drivers/gpu/drm/virtio/virtgpu_gem.c +2 -2
@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,if (!vgdev->has_virgl_3d)return 0 ; - r =virtio_gpu_object_reserve (qobj, false); + r =virtio_gpu_object_reserve (qobj);if (r)return r;
@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,if (!vgdev->has_virgl_3d)return ; - r =virtio_gpu_object_reserve (qobj, false); + r =virtio_gpu_object_reserve (qobj);if (r)return ;
drivers/gpu/drm/virtio/virtgpu_ioctl.c +2 -2
@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, qobj =gem_to_virtio_gpu_obj (gobj); - ret =virtio_gpu_object_reserve (qobj, false); + ret =virtio_gpu_object_reserve (qobj);if (ret) goto out;
@@ -427,7 +427,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data, qobj =gem_to_virtio_gpu_obj (gobj); - ret =virtio_gpu_object_reserve (qobj, false); + ret =virtio_gpu_object_reserve (qobj);if (ret) goto out;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 5/18 drm/virtio: drop no_wait argument from virtio_gpu_object_reserve
In reply to Gerd HoffmannAll callers pass no_wait = false.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 5 ++--- drivers/gpu/drm/virtio/virtgpu_gem.c | 4 ++-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -3
@@ -398,12 +398,11 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo)return drm_vma_node_offset_addr (&bo->tbo.vma_node); } -static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo, -bool no_wait) +static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) {int r; - r =ttm_bo_reserve (&bo->tbo, true, no_wait,NULL ); + r =ttm_bo_reserve (&bo->tbo, true, false,NULL );if (unlikely (r !=0 )) {if (r != -ERESTARTSYS ) { struct virtio_gpu_device *qdev =
drivers/gpu/drm/virtio/virtgpu_gem.c +2 -2
@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,if (!vgdev->has_virgl_3d)return 0 ; - r =virtio_gpu_object_reserve (qobj, false); + r =virtio_gpu_object_reserve (qobj);if (r)return r;
@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,if (!vgdev->has_virgl_3d)return ; - r =virtio_gpu_object_reserve (qobj, false); + r =virtio_gpu_object_reserve (qobj);if (r)return ;
drivers/gpu/drm/virtio/virtgpu_ioctl.c +2 -2
@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, qobj =gem_to_virtio_gpu_obj (gobj); - ret =virtio_gpu_object_reserve (qobj, false); + ret =virtio_gpu_object_reserve (qobj);if (ret) goto out;
@@ -427,7 +427,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data, qobj =gem_to_virtio_gpu_obj (gobj); - ret =virtio_gpu_object_reserve (qobj, false); + ret =virtio_gpu_object_reserve (qobj);if (ret) goto out;
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 6/18 drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve}
In reply to Gerd HoffmannCall reservation_object_* directly instead
of using ttm_bo_{reserve,unreserve}.
v4: check for EINTR only.
v3: check for EINTR too.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -3
@@ -402,9 +402,9 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo) {int r; - r =ttm_bo_reserve (&bo->tbo, true, false,NULL ); + r =reservation_object_lock_interruptible (bo->gem_base.resv,NULL );if (unlikely (r !=0 )) { -if (r != -ERESTARTSYS ) { +if (r != -EINTR ) {struct virtio_gpu_device *qdev = bo->gem_base.dev->dev_private;dev_err (qdev->dev,"%p reserve failed\n" , bo);
@@ -416,7 +416,7 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) { -ttm_bo_unreserve (&bo->tbo); +reservation_object_unlock (bo->gem_base.resv); }/* virgl debufs */
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 6/18 drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve}
In reply to Gerd HoffmannCall reservation_object_* directly instead
of using ttm_bo_{reserve,unreserve}.
v4: check for EINTR only.
v3: check for EINTR too.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -3
@@ -402,9 +402,9 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo) {int r; - r =ttm_bo_reserve (&bo->tbo, true, false,NULL ); + r =reservation_object_lock_interruptible (bo->gem_base.resv,NULL );if (unlikely (r !=0 )) { -if (r != -ERESTARTSYS ) { +if (r != -EINTR ) {struct virtio_gpu_device *qdev = bo->gem_base.dev->dev_private;dev_err (qdev->dev,"%p reserve failed\n" , bo);
@@ -416,7 +416,7 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) { -ttm_bo_unreserve (&bo->tbo); +reservation_object_unlock (bo->gem_base.resv); }/* virgl debufs */
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 7/18 drm/virtio: add virtio_gpu_object_array & helpers
In reply to Gerd HoffmannSome helper functions to manage an array of gem objects.
v6:
- add ticket to struct virtio_gpu_object_array.
- add virtio_gpu_array_{lock,unlock}_resv helpers.
- add virtio_gpu_array_add_fence helper.
v5: some small optimizations (Chia-I Wu).
v4: make them virtio-private instead of generic helpers.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 17 +++++ drivers/gpu/drm/virtio/virtgpu_gem.c | 94 ++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+)
drivers/gpu/drm/virtio/virtgpu_drv.h +17 -0
@@ -84,6 +84,12 @@ struct virtio_gpu_object {#define gem_to_virtio_gpu_obj (gobj) \ container_of((gobj), struct virtio_gpu_object, gem_base) +struct virtio_gpu_object_array { +struct ww_acquire_ctx ticket; +u32 nents, total; +struct drm_gem_object *objs[]; +}; +struct virtio_gpu_vbuffer ;struct virtio_gpu_device ;
@@ -251,6 +257,17 @@ int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv,struct drm_device *dev, uint32_t handle, uint64_t *offset_p); +struct virtio_gpu_object_array *virtio_gpu_array_alloc (u32 nents); +struct virtio_gpu_object_array * +virtio_gpu_array_from_handles (struct drm_file *drm_file,u32 *handles,u32 nents); +void virtio_gpu_array_add_obj (struct virtio_gpu_object_array *objs, +struct drm_gem_object *obj); +int virtio_gpu_array_lock_resv (struct virtio_gpu_object_array *objs); +void virtio_gpu_array_unlock_resv (struct virtio_gpu_object_array *objs); +void virtio_gpu_array_add_fence (struct virtio_gpu_object_array *objs, +struct dma_fence *fence); +void virtio_gpu_array_put_free (struct virtio_gpu_object_array *objs); +/* virtio vg */ int virtio_gpu_alloc_vbufs (struct virtio_gpu_device *vgdev);void virtio_gpu_free_vbufs (struct virtio_gpu_device *vgdev);
drivers/gpu/drm/virtio/virtgpu_gem.c +94 -0
97 lines not on this page · raw message
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 7/18 drm/virtio: add virtio_gpu_object_array & helpers
In reply to Gerd HoffmannSome helper functions to manage an array of gem objects.
v6:
- add ticket to struct virtio_gpu_object_array.
- add virtio_gpu_array_{lock,unlock}_resv helpers.
- add virtio_gpu_array_add_fence helper.
v5: some small optimizations (Chia-I Wu).
v4: make them virtio-private instead of generic helpers.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 17 +++++ drivers/gpu/drm/virtio/virtgpu_gem.c | 94 ++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+)
drivers/gpu/drm/virtio/virtgpu_drv.h +17 -0
@@ -84,6 +84,12 @@ struct virtio_gpu_object {#define gem_to_virtio_gpu_obj (gobj) \ container_of((gobj), struct virtio_gpu_object, gem_base) +struct virtio_gpu_object_array { +struct ww_acquire_ctx ticket; +u32 nents, total; +struct drm_gem_object *objs[]; +}; +struct virtio_gpu_vbuffer ;struct virtio_gpu_device ;
@@ -251,6 +257,17 @@ int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv,struct drm_device *dev, uint32_t handle, uint64_t *offset_p); +struct virtio_gpu_object_array *virtio_gpu_array_alloc (u32 nents); +struct virtio_gpu_object_array * +virtio_gpu_array_from_handles (struct drm_file *drm_file,u32 *handles,u32 nents); +void virtio_gpu_array_add_obj (struct virtio_gpu_object_array *objs, +struct drm_gem_object *obj); +int virtio_gpu_array_lock_resv (struct virtio_gpu_object_array *objs); +void virtio_gpu_array_unlock_resv (struct virtio_gpu_object_array *objs); +void virtio_gpu_array_add_fence (struct virtio_gpu_object_array *objs, +struct dma_fence *fence); +void virtio_gpu_array_put_free (struct virtio_gpu_object_array *objs); +/* virtio vg */ int virtio_gpu_alloc_vbufs (struct virtio_gpu_device *vgdev);void virtio_gpu_free_vbufs (struct virtio_gpu_device *vgdev);
drivers/gpu/drm/virtio/virtgpu_gem.c +94 -0
97 lines not on this page · raw message
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 8/18 drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing
In reply to Gerd HoffmannRework fencing workflow, starting with virtio_gpu_execbuffer_ioctl. Stop using ttm helpers, use the virtio_gpu_array_* helpers (which work on the reservation objects directly) instead.
Also store the object array in struct virtio_gpu_vbuffer, so we explicitly keep a reference of all buffers used instead of depending on ttm_bo_put() checking whenever the object is actually idle before releasing it.
New workflow:
(1) All gem objects needed by a command are added to a virtio_gpu_object_array.
(2) All reservation objects will be locked (virtio_gpu_array_lock_resv).
(3) virtio_gpu_fence_emit() completes fence initialization.
(4) fence gets added to the objects, reservation objects are unlocked (virtio_gpu_array_add_fence, virtio_gpu_array_unlock_resv).
(5) virtio command is submitted to the host.
(6) The completion callback (virtio_gpu_dequeue_ctrl_func) will drop object references and free virtio_gpu_object_array.
v6: rewrite most of the patch.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 ++- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 56 +++++++++----------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 21 +++++++--- 3 files changed, 38 insertions(+), 45 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +4 -2
@@ -121,9 +121,9 @@ struct virtio_gpu_vbuffer {char *resp_buf;int resp_size; -virtio_gpu_resp_cb resp_cb; +struct virtio_gpu_object_array *objs;struct list_head list; };
@@ -318,7 +318,9 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev, uint32_t resource_id);void virtio_gpu_cmd_submit (struct virtio_gpu_device *vgdev,void *data,uint32_t data_size, -uint32_t ctx_id,struct virtio_gpu_fence *fence); +uint32_t ctx_id, +struct virtio_gpu_object_array *objs, +struct virtio_gpu_fence *fence); void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, uint32_t resource_id, uint32_t ctx_id, uint64_t offset, uint32_t level,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +18 -38
98 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +16 -5
@@ -192,7 +192,7 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work) }while (!virtqueue_enable_cb (vgdev->ctrlq.vq));spin_unlock (&vgdev->ctrlq.qlock); -list_for_each_entry_safe (entry, tmp, &reclaim_list, list) { +list_for_each_entry (entry, &reclaim_list, list) { resp = (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;trace_virtio_gpu_cmd_response (vgdev->ctrlq.vq, resp);
@@ -219,14 +219,18 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work) }if (entry->resp_cb) entry->resp_cb (vgdev, entry); - -list_del (&entry->list); -free_vbuf (vgdev, entry); }wake_up (&vgdev->ctrlq.ack_queue);if (fence_id)virtio_gpu_fence_event_process (vgdev, fence_id); + +list_for_each_entry_safe (entry, tmp, &reclaim_list, list) { +if (entry->objs) +virtio_gpu_array_put_free (entry->objs); +list_del (&entry->list); +free_vbuf (vgdev, entry); + } }void virtio_gpu_dequeue_cursor_func (struct work_struct *work)
@@ -338,6 +342,10 @@ static int virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,if (fence)virtio_gpu_fence_emit (vgdev, hdr, fence); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + } rc =virtio_gpu_queue_ctrl_buffer_locked (vgdev, vbuf);spin_unlock (&vgdev->ctrlq.qlock);return rc;
@@ -940,7 +948,9 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_submit (struct virtio_gpu_device *vgdev,void *data,uint32_t data_size, -uint32_t ctx_id,struct virtio_gpu_fence *fence) +uint32_t ctx_id, +struct virtio_gpu_object_array *objs, +struct virtio_gpu_fence *fence) {struct virtio_gpu_cmd_submit *cmd_p;struct virtio_gpu_vbuffer *vbuf;
@@ -950,6 +960,7 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, vbuf->data_buf = data; vbuf->data_size = data_size; + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_SUBMIT_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 8/18 drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing
In reply to Gerd HoffmannRework fencing workflow, starting with virtio_gpu_execbuffer_ioctl. Stop using ttm helpers, use the virtio_gpu_array_* helpers (which work on the reservation objects directly) instead.
Also store the object array in struct virtio_gpu_vbuffer, so we explicitly keep a reference of all buffers used instead of depending on ttm_bo_put() checking whenever the object is actually idle before releasing it.
New workflow:
(1) All gem objects needed by a command are added to a virtio_gpu_object_array.
(2) All reservation objects will be locked (virtio_gpu_array_lock_resv).
(3) virtio_gpu_fence_emit() completes fence initialization.
(4) fence gets added to the objects, reservation objects are unlocked (virtio_gpu_array_add_fence, virtio_gpu_array_unlock_resv).
(5) virtio command is submitted to the host.
(6) The completion callback (virtio_gpu_dequeue_ctrl_func) will drop object references and free virtio_gpu_object_array.
v6: rewrite most of the patch.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 ++- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 56 +++++++++----------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 21 +++++++--- 3 files changed, 38 insertions(+), 45 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +4 -2
@@ -121,9 +121,9 @@ struct virtio_gpu_vbuffer {char *resp_buf;int resp_size; -virtio_gpu_resp_cb resp_cb; +struct virtio_gpu_object_array *objs;struct list_head list; };
@@ -318,7 +318,9 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev, uint32_t resource_id);void virtio_gpu_cmd_submit (struct virtio_gpu_device *vgdev,void *data,uint32_t data_size, -uint32_t ctx_id,struct virtio_gpu_fence *fence); +uint32_t ctx_id, +struct virtio_gpu_object_array *objs, +struct virtio_gpu_fence *fence); void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, uint32_t resource_id, uint32_t ctx_id, uint64_t offset, uint32_t level,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +18 -38
98 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +16 -5
@@ -192,7 +192,7 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work) }while (!virtqueue_enable_cb (vgdev->ctrlq.vq));spin_unlock (&vgdev->ctrlq.qlock); -list_for_each_entry_safe (entry, tmp, &reclaim_list, list) { +list_for_each_entry (entry, &reclaim_list, list) { resp = (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;trace_virtio_gpu_cmd_response (vgdev->ctrlq.vq, resp);
@@ -219,14 +219,18 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work) }if (entry->resp_cb) entry->resp_cb (vgdev, entry); - -list_del (&entry->list); -free_vbuf (vgdev, entry); }wake_up (&vgdev->ctrlq.ack_queue);if (fence_id)virtio_gpu_fence_event_process (vgdev, fence_id); + +list_for_each_entry_safe (entry, tmp, &reclaim_list, list) { +if (entry->objs) +virtio_gpu_array_put_free (entry->objs); +list_del (&entry->list); +free_vbuf (vgdev, entry); + } }void virtio_gpu_dequeue_cursor_func (struct work_struct *work)
@@ -338,6 +342,10 @@ static int virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,if (fence)virtio_gpu_fence_emit (vgdev, hdr, fence); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + } rc =virtio_gpu_queue_ctrl_buffer_locked (vgdev, vbuf);spin_unlock (&vgdev->ctrlq.qlock);return rc;
@@ -940,7 +948,9 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_submit (struct virtio_gpu_device *vgdev,void *data,uint32_t data_size, -uint32_t ctx_id,struct virtio_gpu_fence *fence) +uint32_t ctx_id, +struct virtio_gpu_object_array *objs, +struct virtio_gpu_fence *fence) {struct virtio_gpu_cmd_submit *cmd_p;struct virtio_gpu_vbuffer *vbuf;
@@ -950,6 +960,7 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, vbuf->data_buf = data; vbuf->data_size = data_size; + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_SUBMIT_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 9/18 drm/virtio: rework virtio_gpu_object_create fencing
In reply to Gerd HoffmannRework fencing workflow. Stop using ttm helpers, use the virtio_gpu_array_* helpers instead.
Due to using the gem reservation object it is initialized and ready for use before calling ttm_bo_init. So we can simply use the standard fencing workflow and drop the tricky logic which checks whenever the command is in flight still.
v6: rewrite most of the patch.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 2 + drivers/gpu/drm/virtio/virtgpu_object.c | 74 +++++++++++-------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++ 3 files changed, 37 insertions(+), 43 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -0
@@ -274,6 +274,7 @@ void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev);void virtio_gpu_cmd_create_resource (struct virtio_gpu_device *vgdev,struct virtio_gpu_object *bo,struct virtio_gpu_object_params *params, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void virtio_gpu_cmd_unref_resource (struct virtio_gpu_device *vgdev,uint32_t resource_id);
@@ -336,6 +337,7 @@ void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, + struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_ctrl_ack (struct virtqueue *vq);void virtio_gpu_cursor_ack (struct virtqueue *vq);
drivers/gpu/drm/virtio/virtgpu_object.c +31 -43
100 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +4 -0
@@ -396,6 +396,7 @@ static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_create_resource (struct virtio_gpu_device *vgdev,struct virtio_gpu_object *bo,struct virtio_gpu_object_params *params, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {struct virtio_gpu_resource_create_2d *cmd_p;
@@ -403,6 +404,7 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_RESOURCE_CREATE_2D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
@@ -869,6 +871,7 @@ void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, + struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence) { struct virtio_gpu_resource_create_3d *cmd_p;
@@ -876,6 +879,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_RESOURCE_CREATE_3D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 9/18 drm/virtio: rework virtio_gpu_object_create fencing
In reply to Gerd HoffmannRework fencing workflow. Stop using ttm helpers, use the virtio_gpu_array_* helpers instead.
Due to using the gem reservation object it is initialized and ready for use before calling ttm_bo_init. So we can simply use the standard fencing workflow and drop the tricky logic which checks whenever the command is in flight still.
v6: rewrite most of the patch.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 2 + drivers/gpu/drm/virtio/virtgpu_object.c | 74 +++++++++++-------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++ 3 files changed, 37 insertions(+), 43 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -0
@@ -274,6 +274,7 @@ void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev);void virtio_gpu_cmd_create_resource (struct virtio_gpu_device *vgdev,struct virtio_gpu_object *bo,struct virtio_gpu_object_params *params, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void virtio_gpu_cmd_unref_resource (struct virtio_gpu_device *vgdev,uint32_t resource_id);
@@ -336,6 +337,7 @@ void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, + struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_ctrl_ack (struct virtqueue *vq);void virtio_gpu_cursor_ack (struct virtqueue *vq);
drivers/gpu/drm/virtio/virtgpu_object.c +31 -43
100 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +4 -0
@@ -396,6 +396,7 @@ static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_create_resource (struct virtio_gpu_device *vgdev,struct virtio_gpu_object *bo,struct virtio_gpu_object_params *params, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {struct virtio_gpu_resource_create_2d *cmd_p;
@@ -403,6 +404,7 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_RESOURCE_CREATE_2D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
@@ -869,6 +871,7 @@ void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, + struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence) { struct virtio_gpu_resource_create_3d *cmd_p;
@@ -876,6 +879,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_RESOURCE_CREATE_3D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 10/18 drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 40 ++++++++++---------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 8 ++++-- 3 files changed, 23 insertions(+), 28 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -1
@@ -323,9 +323,10 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev, -uint32_t resource_id,uint32_t ctx_id, +uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +15 -25
@@ -340,9 +340,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv;struct drm_virtgpu_3d_transfer_from_host *args = data; -struct ttm_operation_ctx ctx = { true, false }; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct virtio_gpu_object_array *objs;struct virtio_gpu_fence *fence;int ret;u32 offset = args->offset;
@@ -351,39 +349,31 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (vgdev->has_virgl_3d == false)return -ENOSYS ; - gobj =drm_gem_object_lookup (file, args->bo_handle); -if (gobj ==NULL ) + objs =virtio_gpu_array_from_handles (file, &args->bo_handle,1 ); +if (objs ==NULL )return -ENOENT ; - qobj =gem_to_virtio_gpu_obj (gobj); - - ret =virtio_gpu_object_reserve (qobj); -if (ret) - goto out; - - ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, &ctx); -if (unlikely (ret)) - goto out_unres; + ret =virtio_gpu_array_lock_resv (objs); +if (ret !=0 ) + goto err_put_free;convert_to_hw_box (&box, &args->box); fence =virtio_gpu_fence_alloc (vgdev);if (!fence) { ret = -ENOMEM ; - goto out_unres; + goto err_unlock; }virtio_gpu_cmd_transfer_from_host_3d - (vgdev, qobj->hw_res_handle, - vfpriv->ctx_id, offset, args->level, - &box, fence); -reservation_object_add_excl_fence (qobj->tbo.resv, - &fence->f); - + (vgdev, vfpriv->ctx_id, offset, args->level, + &box, objs, fence);dma_fence_put (&fence->f); -out_unres: -virtio_gpu_object_unreserve (qobj); -out: -drm_gem_object_put_unlocked (gobj); +return 0 ; + +err_unlock: +virtio_gpu_array_unlock_resv (objs); +err_put_free: +virtio_gpu_array_put_free (objs);return ret; }
drivers/gpu/drm/virtio/virtgpu_vq.c +6 -2
@@ -929,20 +929,24 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev, -uint32_t resource_id,uint32_t ctx_id, +uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_host_3d *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; + cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); cmd_p->box = *box; cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 10/18 drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 40 ++++++++++---------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 8 ++++-- 3 files changed, 23 insertions(+), 28 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -1
@@ -323,9 +323,10 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev, -uint32_t resource_id,uint32_t ctx_id, +uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +15 -25
@@ -340,9 +340,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv;struct drm_virtgpu_3d_transfer_from_host *args = data; -struct ttm_operation_ctx ctx = { true, false }; -struct drm_gem_object *gobj =NULL ; -struct virtio_gpu_object *qobj =NULL ; +struct virtio_gpu_object_array *objs;struct virtio_gpu_fence *fence;int ret;u32 offset = args->offset;
@@ -351,39 +349,31 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (vgdev->has_virgl_3d == false)return -ENOSYS ; - gobj =drm_gem_object_lookup (file, args->bo_handle); -if (gobj ==NULL ) + objs =virtio_gpu_array_from_handles (file, &args->bo_handle,1 ); +if (objs ==NULL )return -ENOENT ; - qobj =gem_to_virtio_gpu_obj (gobj); - - ret =virtio_gpu_object_reserve (qobj); -if (ret) - goto out; - - ret =ttm_bo_validate (&qobj->tbo, &qobj->placement, &ctx); -if (unlikely (ret)) - goto out_unres; + ret =virtio_gpu_array_lock_resv (objs); +if (ret !=0 ) + goto err_put_free;convert_to_hw_box (&box, &args->box); fence =virtio_gpu_fence_alloc (vgdev);if (!fence) { ret = -ENOMEM ; - goto out_unres; + goto err_unlock; }virtio_gpu_cmd_transfer_from_host_3d - (vgdev, qobj->hw_res_handle, - vfpriv->ctx_id, offset, args->level, - &box, fence); -reservation_object_add_excl_fence (qobj->tbo.resv, - &fence->f); - + (vgdev, vfpriv->ctx_id, offset, args->level, + &box, objs, fence);dma_fence_put (&fence->f); -out_unres: -virtio_gpu_object_unreserve (qobj); -out: -drm_gem_object_put_unlocked (gobj); +return 0 ; + +err_unlock: +virtio_gpu_array_unlock_resv (objs); +err_put_free: +virtio_gpu_array_put_free (objs);return ret; }
drivers/gpu/drm/virtio/virtgpu_vq.c +6 -2
@@ -929,20 +929,24 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev, -uint32_t resource_id,uint32_t ctx_id, +uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_host_3d *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; + cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); cmd_p->box = *box; cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 11/18 drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 +-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 50 +++++++++++--------------- drivers/gpu/drm/virtio/virtgpu_plane.c | 21 ++++++++--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++-- 4 files changed, 47 insertions(+), 37 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -2
@@ -279,10 +279,10 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_unref_resource (struct virtio_gpu_device *vgdev,uint32_t resource_id);void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint64_t offset,__le32 width,__le32 height,__le32 x,__le32 y, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev, uint32_t resource_id,
@@ -329,10 +329,10 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +21 -29
73 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_plane.c +17 -4
@@ -109,12 +109,19 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); handle = bo->hw_res_handle;if (bo->dumb) { +struct virtio_gpu_object_array *objs; + + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d - (vgdev, bo,0 , + (vgdev,0 ,cpu_to_le32 (plane->state->src_w >>16 ),cpu_to_le32 (plane->state->src_h >>16 ),cpu_to_le32 (plane->state->src_x >>16 ), -cpu_to_le32 (plane->state->src_y >>16 ),NULL ); +cpu_to_le32 (plane->state->src_y >>16 ), + objs,NULL ); } }else { handle =0 ;
@@ -204,11 +211,17 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {/* new cursor -- update & wait */ +struct virtio_gpu_object_array *objs; + + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d - (vgdev, bo,0 , + (vgdev,0 ,cpu_to_le32 (plane->state->crtc_w),cpu_to_le32 (plane->state->crtc_h), -0 ,0 , vgfb->fence); +0 ,0 , objs, vgfb->fence);dma_fence_wait (&vgfb->fence->f, true);dma_fence_put (&vgfb->fence->f); vgfb->fence =NULL ;
drivers/gpu/drm/virtio/virtgpu_vq.c +7 -2
@@ -491,12 +491,13 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint64_t offset,__le32 width,__le32 height,__le32 x,__le32 y, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_to_host_2d *cmd_p;struct virtio_gpu_vbuffer *vbuf;bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);
@@ -508,6 +509,7 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
@@ -900,12 +902,13 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_host_3d *cmd_p;struct virtio_gpu_vbuffer *vbuf;bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);
@@ -918,6 +921,8 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; + cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 11/18 drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 +-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 50 +++++++++++--------------- drivers/gpu/drm/virtio/virtgpu_plane.c | 21 ++++++++--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++-- 4 files changed, 47 insertions(+), 37 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -2
@@ -279,10 +279,10 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_unref_resource (struct virtio_gpu_device *vgdev,uint32_t resource_id);void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint64_t offset,__le32 width,__le32 height,__le32 x,__le32 y, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev, uint32_t resource_id,
@@ -329,10 +329,10 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,struct virtio_gpu_object_array *objs, struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/virtgpu_ioctl.c +21 -29
73 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_plane.c +17 -4
@@ -109,12 +109,19 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); handle = bo->hw_res_handle;if (bo->dumb) { +struct virtio_gpu_object_array *objs; + + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d - (vgdev, bo,0 , + (vgdev,0 ,cpu_to_le32 (plane->state->src_w >>16 ),cpu_to_le32 (plane->state->src_h >>16 ),cpu_to_le32 (plane->state->src_x >>16 ), -cpu_to_le32 (plane->state->src_y >>16 ),NULL ); +cpu_to_le32 (plane->state->src_y >>16 ), + objs,NULL ); } }else { handle =0 ;
@@ -204,11 +211,17 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {/* new cursor -- update & wait */ +struct virtio_gpu_object_array *objs; + + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d - (vgdev, bo,0 , + (vgdev,0 ,cpu_to_le32 (plane->state->crtc_w),cpu_to_le32 (plane->state->crtc_h), -0 ,0 , vgfb->fence); +0 ,0 , objs, vgfb->fence);dma_fence_wait (&vgfb->fence->f, true);dma_fence_put (&vgfb->fence->f); vgfb->fence =NULL ;
drivers/gpu/drm/virtio/virtgpu_vq.c +7 -2
@@ -491,12 +491,13 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint64_t offset,__le32 width,__le32 height,__le32 x,__le32 y, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_to_host_2d *cmd_p;struct virtio_gpu_vbuffer *vbuf;bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);
@@ -508,6 +509,7 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D ); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
@@ -900,12 +902,13 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, }void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev, -struct virtio_gpu_object *bo,uint32_t ctx_id,uint64_t offset,uint32_t level,struct virtio_gpu_box *box, +struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_transfer_host_3d *cmd_p;struct virtio_gpu_vbuffer *vbuf;bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);
@@ -918,6 +921,8 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; + cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 12/18 drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++-- drivers/gpu/drm/virtio/virtgpu_gem.c | 24 +++++++++++------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++++---- 3 files changed, 21 insertions(+), 19 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -2
@@ -313,10 +313,10 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev, uint32_t id);void virtio_gpu_cmd_context_attach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id); +struct virtio_gpu_object_array *objs);void virtio_gpu_cmd_context_detach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id); +struct virtio_gpu_object_array *objs); void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, void *data, uint32_t data_size, uint32_t ctx_id,
drivers/gpu/drm/virtio/virtgpu_gem.c +11 -13
@@ -136,19 +136,18 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, {struct virtio_gpu_device *vgdev = obj->dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv; -struct virtio_gpu_object *qobj =gem_to_virtio_gpu_obj (obj); -int r; +struct virtio_gpu_object_array *objs;if (!vgdev->has_virgl_3d)return 0 ; - r =virtio_gpu_object_reserve (qobj); -if (r) -return r; + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return -ENOMEM ; +virtio_gpu_array_add_obj (objs, obj);virtio_gpu_cmd_context_attach_resource (vgdev, vfpriv->ctx_id, - qobj->hw_res_handle); -virtio_gpu_object_unreserve (qobj); + objs);return 0 ; }
@@ -157,19 +156,18 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj, {struct virtio_gpu_device *vgdev = obj->dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv; -struct virtio_gpu_object *qobj =gem_to_virtio_gpu_obj (obj); -int r; +struct virtio_gpu_object_array *objs;if (!vgdev->has_virgl_3d)return ; - r =virtio_gpu_object_reserve (qobj); -if (r) + objs =virtio_gpu_array_alloc (1 ); +if (!objs)return ; +virtio_gpu_array_add_obj (objs, obj);virtio_gpu_cmd_context_detach_resource (vgdev, vfpriv->ctx_id, - qobj->hw_res_handle); -virtio_gpu_object_unreserve (qobj); + objs); }struct virtio_gpu_object_array *virtio_gpu_array_alloc (u32 nents)
drivers/gpu/drm/virtio/virtgpu_vq.c +8 -4
@@ -838,34 +838,38 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_context_attach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id) +struct virtio_gpu_object_array *objs) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_ctx_resource *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); }void virtio_gpu_cmd_context_detach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id) +struct virtio_gpu_object_array *objs) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_ctx_resource *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 12/18 drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource
In reply to Gerd HoffmannSwitch to the virtio_gpu_array_* helper workflow.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++-- drivers/gpu/drm/virtio/virtgpu_gem.c | 24 +++++++++++------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++++---- 3 files changed, 21 insertions(+), 19 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -2
@@ -313,10 +313,10 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev, uint32_t id);void virtio_gpu_cmd_context_attach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id); +struct virtio_gpu_object_array *objs);void virtio_gpu_cmd_context_detach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id); +struct virtio_gpu_object_array *objs); void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, void *data, uint32_t data_size, uint32_t ctx_id,
drivers/gpu/drm/virtio/virtgpu_gem.c +11 -13
@@ -136,19 +136,18 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, {struct virtio_gpu_device *vgdev = obj->dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv; -struct virtio_gpu_object *qobj =gem_to_virtio_gpu_obj (obj); -int r; +struct virtio_gpu_object_array *objs;if (!vgdev->has_virgl_3d)return 0 ; - r =virtio_gpu_object_reserve (qobj); -if (r) -return r; + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return -ENOMEM ; +virtio_gpu_array_add_obj (objs, obj);virtio_gpu_cmd_context_attach_resource (vgdev, vfpriv->ctx_id, - qobj->hw_res_handle); -virtio_gpu_object_unreserve (qobj); + objs);return 0 ; }
@@ -157,19 +156,18 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj, {struct virtio_gpu_device *vgdev = obj->dev->dev_private;struct virtio_gpu_fpriv *vfpriv = file->driver_priv; -struct virtio_gpu_object *qobj =gem_to_virtio_gpu_obj (obj); -int r; +struct virtio_gpu_object_array *objs;if (!vgdev->has_virgl_3d)return ; - r =virtio_gpu_object_reserve (qobj); -if (r) + objs =virtio_gpu_array_alloc (1 ); +if (!objs)return ; +virtio_gpu_array_add_obj (objs, obj);virtio_gpu_cmd_context_detach_resource (vgdev, vfpriv->ctx_id, - qobj->hw_res_handle); -virtio_gpu_object_unreserve (qobj); + objs); }struct virtio_gpu_object_array *virtio_gpu_array_alloc (u32 nents)
drivers/gpu/drm/virtio/virtgpu_vq.c +8 -4
@@ -838,34 +838,38 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_context_attach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id) +struct virtio_gpu_object_array *objs) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_ctx_resource *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); }void virtio_gpu_cmd_context_detach_resource (struct virtio_gpu_device *vgdev,uint32_t ctx_id, -uint32_t resource_id) +struct virtio_gpu_object_array *objs) { +struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (objs->objs[0 ]);struct virtio_gpu_ctx_resource *cmd_p;struct virtio_gpu_vbuffer *vbuf; cmd_p =virtio_gpu_alloc_cmd (vgdev, &vbuf,sizeof (*cmd_p));memset (cmd_p,0 ,sizeof (*cmd_p)); + vbuf->objs = objs; cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); - cmd_p->resource_id =cpu_to_le32 (resource_id); + cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle);virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 13/18 drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 -- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 39 -------------------------- 2 files changed, 42 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -3
@@ -223,9 +223,6 @@ struct virtio_gpu_fpriv {/* virtio_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS ]; -int virtio_gpu_object_list_validate (struct ww_acquire_ctx *ticket, -struct list_head *head); -void virtio_gpu_unref_list (struct list_head *head);/* virtio_kms.c */ int virtio_gpu_init (struct drm_device *dev);
drivers/gpu/drm/virtio/virtgpu_ioctl.c +0 -39
@@ -56,45 +56,6 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data, &virtio_gpu_map->offset); } -int virtio_gpu_object_list_validate (struct ww_acquire_ctx *ticket, -struct list_head *head) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct ttm_validate_buffer *buf; -struct ttm_buffer_object *bo; -struct virtio_gpu_object *qobj; -int ret; - - ret =ttm_eu_reserve_buffers (ticket, head, true,NULL , true); -if (ret !=0 ) -return ret; - -list_for_each_entry (buf, head, head) { - bo = buf->bo; - qobj = container_of(bo, struct virtio_gpu_object, tbo); - ret =ttm_bo_validate (bo, &qobj->placement, &ctx); -if (ret) { -ttm_eu_backoff_reservation (ticket, head); -return ret; - } - } -return 0 ; -} - -void virtio_gpu_unref_list (struct list_head *head) -{ -struct ttm_validate_buffer *buf; -struct ttm_buffer_object *bo; -struct virtio_gpu_object *qobj; - -list_for_each_entry (buf, head, head) { - bo = buf->bo; - qobj = container_of(bo, struct virtio_gpu_object, tbo); - -drm_gem_object_put_unlocked (&qobj->gem_base); - } -} -/* * Usage of execbuffer: * Relocations need to take into account the full VIRTIO_GPUDrawable size.
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 13/18 drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 -- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 39 -------------------------- 2 files changed, 42 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -3
@@ -223,9 +223,6 @@ struct virtio_gpu_fpriv {/* virtio_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS ]; -int virtio_gpu_object_list_validate (struct ww_acquire_ctx *ticket, -struct list_head *head); -void virtio_gpu_unref_list (struct list_head *head);/* virtio_kms.c */ int virtio_gpu_init (struct drm_device *dev);
drivers/gpu/drm/virtio/virtgpu_ioctl.c +0 -39
@@ -56,45 +56,6 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data, &virtio_gpu_map->offset); } -int virtio_gpu_object_list_validate (struct ww_acquire_ctx *ticket, -struct list_head *head) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct ttm_validate_buffer *buf; -struct ttm_buffer_object *bo; -struct virtio_gpu_object *qobj; -int ret; - - ret =ttm_eu_reserve_buffers (ticket, head, true,NULL , true); -if (ret !=0 ) -return ret; - -list_for_each_entry (buf, head, head) { - bo = buf->bo; - qobj = container_of(bo, struct virtio_gpu_object, tbo); - ret =ttm_bo_validate (bo, &qobj->placement, &ctx); -if (ret) { -ttm_eu_backoff_reservation (ticket, head); -return ret; - } - } -return 0 ; -} - -void virtio_gpu_unref_list (struct list_head *head) -{ -struct ttm_validate_buffer *buf; -struct ttm_buffer_object *bo; -struct virtio_gpu_object *qobj; - -list_for_each_entry (buf, head, head) { - bo = buf->bo; - qobj = container_of(bo, struct virtio_gpu_object, tbo); - -drm_gem_object_put_unlocked (&qobj->gem_base); - } -} -/* * Usage of execbuffer: * Relocations need to take into account the full VIRTIO_GPUDrawable size.
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 14/18 drm/virtio: switch from ttm to gem shmem helpers
In reply to Gerd Hoffmannvirtio-gpu basically needs a sg_table for the bo, to tell the host where the backing pages for the object are. So the gem shmem helpers are a perfect fit. Some drm_gem_object_funcs need thin wrappers to update the host state, but otherwise the helpers handle everything just fine.
Once the fencing was sorted the switch was surprisingly easy and for the most part just removing the ttm code.
v4: fix drm_gem_object_funcs name.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 52 +--- drivers/gpu/drm/virtio/virtgpu_drv.c | 20 +- drivers/gpu/drm/virtio/virtgpu_gem.c | 16 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 9 - drivers/gpu/drm/virtio/virtgpu_object.c | 146 ++++-------- drivers/gpu/drm/virtio/virtgpu_prime.c | 37 --- drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 ------------------------ drivers/gpu/drm/virtio/virtgpu_vq.c | 24 +- drivers/gpu/drm/virtio/Kconfig | 2 +- drivers/gpu/drm/virtio/Makefile | 2 +- 11 files changed, 80 insertions(+), 538 deletions(-) delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c
drivers/gpu/drm/virtio/virtgpu_drv.h +11 -41
@@ -35,12 +35,9 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_module.h> -#include <drm/ttm/ttm_placement.h> #define DRIVER_NAME "virtio_gpu"#define DRIVER_DESC "virtio GPU"
@@ -68,21 +65,16 @@ struct virtio_gpu_object_params { };struct virtio_gpu_object { -struct drm_gem_object gem_base; +struct drm_gem_shmem_object base;uint32_t hw_res_handle;struct sg_table *pages;uint32_t mapped; -void *vmap;bool dumb; -struct ttm_place placement_code; -struct ttm_placement placement; -struct ttm_buffer_object tbo; -struct ttm_bo_kmap_obj kmap;bool created; };#define gem_to_virtio_gpu_obj (gobj) \ - container_of((gobj), struct virtio_gpu_object, gem_base) + container_of((gobj), struct virtio_gpu_object, base.base)struct virtio_gpu_object_array {struct ww_acquire_ctx ticket;
@@ -153,10 +145,6 @@ struct virtio_gpu_framebuffer {#define to_virtio_gpu_framebuffer (x) \ container_of(x, struct virtio_gpu_framebuffer, base) -struct virtio_gpu_mman { -struct ttm_bo_device bdev; -}; -struct virtio_gpu_queue {struct virtqueue *vq;spinlock_t qlock;
@@ -185,8 +173,6 @@ struct virtio_gpu_device {struct virtio_device *vdev; -struct virtio_gpu_mman mman; -struct virtio_gpu_output outputs[VIRTIO_GPU_MAX_SCANOUTS ];uint32_t num_scanouts;
@@ -358,11 +344,6 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,enum drm_plane_type type, int index); -/* virtio_gpu_ttm.c */ -int virtio_gpu_ttm_init (struct virtio_gpu_device *vgdev); -void virtio_gpu_ttm_fini (struct virtio_gpu_device *vgdev); -int virtio_gpu_mmap (struct file *filp,struct vm_area_struct *vma); -/* virtio_gpu_fence.c */ bool virtio_fence_signaled (struct dma_fence *f); struct virtio_gpu_fence *virtio_gpu_fence_alloc(
@@ -374,58 +355,47 @@ void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, u64 last_seq);/* virtio_gpu_object */ +struct drm_gem_object *virtio_gpu_create_object (struct drm_device *dev, +size_t size);int virtio_gpu_object_create (struct virtio_gpu_device *vgdev,struct virtio_gpu_object_params *params,struct virtio_gpu_object **bo_ptr,struct virtio_gpu_fence *fence); -void virtio_gpu_object_kunmap (struct virtio_gpu_object *bo); -int virtio_gpu_object_kmap (struct virtio_gpu_object *bo); -int virtio_gpu_object_get_sg_table (struct virtio_gpu_device *qdev, -struct virtio_gpu_object *bo); -void virtio_gpu_object_free_sg_table (struct virtio_gpu_object *bo);/* virtgpu_prime.c */ -struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);struct drm_gem_object *virtgpu_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sgt); -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, -struct vm_area_struct *vma);static inline struct virtio_gpu_object *virtio_gpu_object_ref (struct virtio_gpu_object *bo) { -ttm_bo_get (&bo->tbo); +drm_gem_object_get (&bo->base.base);return bo; }static inline void virtio_gpu_object_unref (struct virtio_gpu_object **bo) { -struct ttm_buffer_object *tbo; -if ((*bo) ==NULL )return ; - tbo = &((*bo)->tbo); -ttm_bo_put (tbo); +drm_gem_object_put (&(*bo)->base.base); *bo =NULL ; }static inline u64 virtio_gpu_object_mmap_offset (struct virtio_gpu_object *bo) { -return drm_vma_node_offset_addr (&bo->tbo.vma_node); +return drm_vma_node_offset_addr (&bo->base.base.vma_node); }static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) {int r; - r =reservation_object_lock_interruptible (bo->gem_base.resv,NULL ); + r =reservation_object_lock_interruptible (bo->base.base.resv,NULL );if (unlikely (r !=0 )) {if (r != -EINTR ) {struct virtio_gpu_device *qdev = - bo->gem_base.dev->dev_private; + bo->base.base.dev->dev_private;dev_err (qdev->dev,"%p reserve failed\n" , bo); }return r;
@@ -435,7 +405,7 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) { -reservation_object_unlock (bo->gem_base.resv); +reservation_object_unlock (bo->base.base.resv); }/* virgl debufs */
drivers/gpu/drm/virtio/virtgpu_drv.c +2 -18
@@ -185,17 +185,7 @@ MODULE_AUTHOR("Dave Airlie <[email protected]>");MODULE_AUTHOR ("Gerd Hoffmann <[email protected]>" );MODULE_AUTHOR ("Alon Levy" ); -static const struct file_operations virtio_gpu_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = virtio_gpu_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .release = drm_release, - .compat_ioctl = drm_compat_ioctl, - .llseek = noop_llseek, -}; +DEFINE_DRM_GEM_SHMEM_FOPS (virtio_gpu_driver_fops);static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_RENDER |DRIVER_ATOMIC ,
@@ -210,15 +200,9 @@ static struct drm_driver driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table, - .gem_prime_vmap = virtgpu_gem_prime_vmap, - .gem_prime_vunmap = virtgpu_gem_prime_vunmap, - .gem_prime_mmap = virtgpu_gem_prime_mmap, - .gem_free_object_unlocked = virtio_gpu_gem_free_object, - .gem_open_object = virtio_gpu_gem_object_open, - .gem_close_object = virtio_gpu_gem_object_close, + .gem_create_object = virtio_gpu_create_object, .fops = &virtio_gpu_driver_fops, .ioctls = virtio_gpu_ioctls,
drivers/gpu/drm/virtio/virtgpu_gem.c +4 -12
@@ -28,14 +28,6 @@#include "virtgpu_drv.h" -void virtio_gpu_gem_free_object (struct drm_gem_object *gem_obj) -{ -struct virtio_gpu_object *obj =gem_to_virtio_gpu_obj (gem_obj); - -if (obj) -virtio_gpu_object_unref (&obj); -} -struct virtio_gpu_object * virtio_gpu_alloc_object(struct drm_device *dev, struct virtio_gpu_object_params *params,
@@ -66,16 +58,16 @@ int virtio_gpu_gem_create(struct drm_file *file,if (IS_ERR (obj))return PTR_ERR (obj); - ret =drm_gem_handle_create (file, &obj->gem_base, &handle); + ret =drm_gem_handle_create (file, &obj->base.base, &handle);if (ret) { -drm_gem_object_release (&obj->gem_base); +drm_gem_object_release (&obj->base.base);return ret; } - *obj_p = &obj->gem_base; + *obj_p = &obj->base.base;/* drop reference from allocate - handle holds it now */ -drm_gem_object_put_unlocked (&obj->gem_base); +drm_gem_object_put_unlocked (&obj->base.base); *handle_p = handle;return 0 ;
drivers/gpu/drm/virtio/virtgpu_ioctl.c +2 -3
@@ -29,7 +29,6 @@#include <linux/sync_file.h> #include <drm/drm_file.h> -#include <drm/ttm/ttm_execbuf_util.h> #include <drm/virtgpu_drm.h> #include "virtgpu_drv.h"
@@ -261,7 +260,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,dma_fence_put (&fence->f);if (IS_ERR (qobj))return PTR_ERR (qobj); - obj = &qobj->gem_base; + obj = &qobj->base.base; ret =drm_gem_handle_create (file_priv, obj, &handle);if (ret) {
@@ -288,7 +287,7 @@ static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data, qobj =gem_to_virtio_gpu_obj (gobj); - ri->size = qobj->gem_base.size; + ri->size = qobj->base.base.size; ri->res_handle = qobj->hw_res_handle;drm_gem_object_put_unlocked (gobj);return 0 ;
drivers/gpu/drm/virtio/virtgpu_kms.c +0 -9
@@ -173,12 +173,6 @@ int virtio_gpu_init(struct drm_device *dev) goto err_vbufs; } - ret =virtio_gpu_ttm_init (vgdev); -if (ret) { -DRM_ERROR ("failed to init ttm %d\n" , ret); - goto err_ttm; - } -/* get display info */ virtio_cread(vgdev->vdev, struct virtio_gpu_config, num_scanouts, &num_scanouts);
@@ -210,8 +204,6 @@ int virtio_gpu_init(struct drm_device *dev)return 0 ; err_scanouts: -virtio_gpu_ttm_fini (vgdev); -err_ttm:virtio_gpu_free_vbufs (vgdev); err_vbufs: vgdev->vdev->config->del_vqs (vgdev->vdev);
@@ -242,7 +234,6 @@ void virtio_gpu_deinit(struct drm_device *dev) vgdev->vdev->config->del_vqs (vgdev->vdev);virtio_gpu_modeset_fini (vgdev); -virtio_gpu_ttm_fini (vgdev);virtio_gpu_free_vbufs (vgdev);virtio_gpu_cleanup_cap_cache (vgdev);kfree (vgdev->capsets);
drivers/gpu/drm/virtio/virtgpu_object.c +41 -105
202 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_prime.c +0 -37
@@ -30,46 +30,9 @@* device that might share buffers with virtgpu */ -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); -} -struct drm_gem_object *virtgpu_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *table) {return ERR_PTR (-ENODEV ); } - -void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj) -{ -struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); -int ret; - - ret =virtio_gpu_object_kmap (bo); -if (ret) -return NULL ; -return bo->vmap; -} - -void virtgpu_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr) -{ -virtio_gpu_object_kunmap (gem_to_virtio_gpu_obj (obj)); -} - -int virtgpu_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma) -{ -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); -}
drivers/gpu/drm/virtio/virtgpu_ttm.c deleted +0 -305
305 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +18 -6
@@ -993,17 +993,21 @@ int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);struct virtio_gpu_mem_entry *ents;struct scatterlist *sg; -int si, nents; +int si, nents, ret;if (WARN_ON_ONCE (!obj->created))return -EINVAL ; +if (WARN_ON_ONCE (obj->pages)) +return -EINVAL ; -if (!obj->pages) { -int ret; + ret =drm_gem_shmem_pin (&obj->base.base); +if (ret <0 ) +return -EINVAL ; - ret =virtio_gpu_object_get_sg_table (vgdev, obj); -if (ret) -return ret; + obj->pages =drm_gem_shmem_get_sg_table (&obj->base.base); +if (obj->pages ==NULL ) { +drm_gem_shmem_unpin (&obj->base.base); +return -EINVAL ; }if (use_dma_api) {
@@ -1042,6 +1046,9 @@ void virtio_gpu_object_detach(struct virtio_gpu_device *vgdev, {bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev); +if (WARN_ON_ONCE (!obj->pages)) +return ; +if (use_dma_api && obj->mapped) {struct virtio_gpu_fence *fence =virtio_gpu_fence_alloc (vgdev);/* detach backing and wait for the host process it ... */
@@ -1057,6 +1064,11 @@ void virtio_gpu_object_detach(struct virtio_gpu_device *vgdev, }else {virtio_gpu_cmd_resource_inval_backing (vgdev, obj->hw_res_handle,NULL ); } + +sg_free_table (obj->pages); + obj->pages =NULL ; + +drm_gem_shmem_unpin (&obj->base.base); } void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_VIRTIO_GPU tristate "Virtio GPU driver" depends on DRM && VIRTIO && MMU select DRM_KMS_HELPER - select DRM_TTM + select DRM_GEM_SHMEM_HELPER help This is the virtual GPU driver for virtio. It can be used with QEMU based VMMs (like KVM or Xen).
drivers/gpu/drm/virtio/Makefile +1 -1
@@ -4,7 +4,7 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o \ - virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \ + virtgpu_display.o virtgpu_vq.o \ virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ virtgpu_ioctl.o virtgpu_prime.o virtgpu_trace_points.o
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 14/18 drm/virtio: switch from ttm to gem shmem helpers
In reply to Gerd Hoffmannvirtio-gpu basically needs a sg_table for the bo, to tell the host where the backing pages for the object are. So the gem shmem helpers are a perfect fit. Some drm_gem_object_funcs need thin wrappers to update the host state, but otherwise the helpers handle everything just fine.
Once the fencing was sorted the switch was surprisingly easy and for the most part just removing the ttm code.
v4: fix drm_gem_object_funcs name.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 52 +--- drivers/gpu/drm/virtio/virtgpu_drv.c | 20 +- drivers/gpu/drm/virtio/virtgpu_gem.c | 16 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 9 - drivers/gpu/drm/virtio/virtgpu_object.c | 146 ++++-------- drivers/gpu/drm/virtio/virtgpu_prime.c | 37 --- drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 ------------------------ drivers/gpu/drm/virtio/virtgpu_vq.c | 24 +- drivers/gpu/drm/virtio/Kconfig | 2 +- drivers/gpu/drm/virtio/Makefile | 2 +- 11 files changed, 80 insertions(+), 538 deletions(-) delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c
drivers/gpu/drm/virtio/virtgpu_drv.h +11 -41
@@ -35,12 +35,9 @@#include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> -#include <drm/ttm/ttm_bo_api.h> -#include <drm/ttm/ttm_bo_driver.h> -#include <drm/ttm/ttm_module.h> -#include <drm/ttm/ttm_placement.h> #define DRIVER_NAME "virtio_gpu"#define DRIVER_DESC "virtio GPU"
@@ -68,21 +65,16 @@ struct virtio_gpu_object_params { };struct virtio_gpu_object { -struct drm_gem_object gem_base; +struct drm_gem_shmem_object base;uint32_t hw_res_handle;struct sg_table *pages;uint32_t mapped; -void *vmap;bool dumb; -struct ttm_place placement_code; -struct ttm_placement placement; -struct ttm_buffer_object tbo; -struct ttm_bo_kmap_obj kmap;bool created; };#define gem_to_virtio_gpu_obj (gobj) \ - container_of((gobj), struct virtio_gpu_object, gem_base) + container_of((gobj), struct virtio_gpu_object, base.base)struct virtio_gpu_object_array {struct ww_acquire_ctx ticket;
@@ -153,10 +145,6 @@ struct virtio_gpu_framebuffer {#define to_virtio_gpu_framebuffer (x) \ container_of(x, struct virtio_gpu_framebuffer, base) -struct virtio_gpu_mman { -struct ttm_bo_device bdev; -}; -struct virtio_gpu_queue {struct virtqueue *vq;spinlock_t qlock;
@@ -185,8 +173,6 @@ struct virtio_gpu_device {struct virtio_device *vdev; -struct virtio_gpu_mman mman; -struct virtio_gpu_output outputs[VIRTIO_GPU_MAX_SCANOUTS ];uint32_t num_scanouts;
@@ -358,11 +344,6 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,enum drm_plane_type type, int index); -/* virtio_gpu_ttm.c */ -int virtio_gpu_ttm_init (struct virtio_gpu_device *vgdev); -void virtio_gpu_ttm_fini (struct virtio_gpu_device *vgdev); -int virtio_gpu_mmap (struct file *filp,struct vm_area_struct *vma); -/* virtio_gpu_fence.c */ bool virtio_fence_signaled (struct dma_fence *f); struct virtio_gpu_fence *virtio_gpu_fence_alloc(
@@ -374,58 +355,47 @@ void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, u64 last_seq);/* virtio_gpu_object */ +struct drm_gem_object *virtio_gpu_create_object (struct drm_device *dev, +size_t size);int virtio_gpu_object_create (struct virtio_gpu_device *vgdev,struct virtio_gpu_object_params *params,struct virtio_gpu_object **bo_ptr,struct virtio_gpu_fence *fence); -void virtio_gpu_object_kunmap (struct virtio_gpu_object *bo); -int virtio_gpu_object_kmap (struct virtio_gpu_object *bo); -int virtio_gpu_object_get_sg_table (struct virtio_gpu_device *qdev, -struct virtio_gpu_object *bo); -void virtio_gpu_object_free_sg_table (struct virtio_gpu_object *bo);/* virtgpu_prime.c */ -struct sg_table *virtgpu_gem_prime_get_sg_table (struct drm_gem_object *obj);struct drm_gem_object *virtgpu_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sgt); -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, -struct vm_area_struct *vma);static inline struct virtio_gpu_object *virtio_gpu_object_ref (struct virtio_gpu_object *bo) { -ttm_bo_get (&bo->tbo); +drm_gem_object_get (&bo->base.base);return bo; }static inline void virtio_gpu_object_unref (struct virtio_gpu_object **bo) { -struct ttm_buffer_object *tbo; -if ((*bo) ==NULL )return ; - tbo = &((*bo)->tbo); -ttm_bo_put (tbo); +drm_gem_object_put (&(*bo)->base.base); *bo =NULL ; }static inline u64 virtio_gpu_object_mmap_offset (struct virtio_gpu_object *bo) { -return drm_vma_node_offset_addr (&bo->tbo.vma_node); +return drm_vma_node_offset_addr (&bo->base.base.vma_node); }static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) {int r; - r =reservation_object_lock_interruptible (bo->gem_base.resv,NULL ); + r =reservation_object_lock_interruptible (bo->base.base.resv,NULL );if (unlikely (r !=0 )) {if (r != -EINTR ) {struct virtio_gpu_device *qdev = - bo->gem_base.dev->dev_private; + bo->base.base.dev->dev_private;dev_err (qdev->dev,"%p reserve failed\n" , bo); }return r;
@@ -435,7 +405,7 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) { -reservation_object_unlock (bo->gem_base.resv); +reservation_object_unlock (bo->base.base.resv); }/* virgl debufs */
drivers/gpu/drm/virtio/virtgpu_drv.c +2 -18
@@ -185,17 +185,7 @@ MODULE_AUTHOR("Dave Airlie <[email protected]>");MODULE_AUTHOR ("Gerd Hoffmann <[email protected]>" );MODULE_AUTHOR ("Alon Levy" ); -static const struct file_operations virtio_gpu_driver_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .mmap = virtio_gpu_mmap, - .poll = drm_poll, - .read = drm_read, - .unlocked_ioctl = drm_ioctl, - .release = drm_release, - .compat_ioctl = drm_compat_ioctl, - .llseek = noop_llseek, -}; +DEFINE_DRM_GEM_SHMEM_FOPS (virtio_gpu_driver_fops);static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_RENDER |DRIVER_ATOMIC ,
@@ -210,15 +200,9 @@ static struct drm_driver driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table, - .gem_prime_vmap = virtgpu_gem_prime_vmap, - .gem_prime_vunmap = virtgpu_gem_prime_vunmap, - .gem_prime_mmap = virtgpu_gem_prime_mmap, - .gem_free_object_unlocked = virtio_gpu_gem_free_object, - .gem_open_object = virtio_gpu_gem_object_open, - .gem_close_object = virtio_gpu_gem_object_close, + .gem_create_object = virtio_gpu_create_object, .fops = &virtio_gpu_driver_fops, .ioctls = virtio_gpu_ioctls,
drivers/gpu/drm/virtio/virtgpu_gem.c +4 -12
@@ -28,14 +28,6 @@#include "virtgpu_drv.h" -void virtio_gpu_gem_free_object (struct drm_gem_object *gem_obj) -{ -struct virtio_gpu_object *obj =gem_to_virtio_gpu_obj (gem_obj); - -if (obj) -virtio_gpu_object_unref (&obj); -} -struct virtio_gpu_object * virtio_gpu_alloc_object(struct drm_device *dev, struct virtio_gpu_object_params *params,
@@ -66,16 +58,16 @@ int virtio_gpu_gem_create(struct drm_file *file,if (IS_ERR (obj))return PTR_ERR (obj); - ret =drm_gem_handle_create (file, &obj->gem_base, &handle); + ret =drm_gem_handle_create (file, &obj->base.base, &handle);if (ret) { -drm_gem_object_release (&obj->gem_base); +drm_gem_object_release (&obj->base.base);return ret; } - *obj_p = &obj->gem_base; + *obj_p = &obj->base.base;/* drop reference from allocate - handle holds it now */ -drm_gem_object_put_unlocked (&obj->gem_base); +drm_gem_object_put_unlocked (&obj->base.base); *handle_p = handle;return 0 ;
drivers/gpu/drm/virtio/virtgpu_ioctl.c +2 -3
@@ -29,7 +29,6 @@#include <linux/sync_file.h> #include <drm/drm_file.h> -#include <drm/ttm/ttm_execbuf_util.h> #include <drm/virtgpu_drm.h> #include "virtgpu_drv.h"
@@ -261,7 +260,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,dma_fence_put (&fence->f);if (IS_ERR (qobj))return PTR_ERR (qobj); - obj = &qobj->gem_base; + obj = &qobj->base.base; ret =drm_gem_handle_create (file_priv, obj, &handle);if (ret) {
@@ -288,7 +287,7 @@ static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data, qobj =gem_to_virtio_gpu_obj (gobj); - ri->size = qobj->gem_base.size; + ri->size = qobj->base.base.size; ri->res_handle = qobj->hw_res_handle;drm_gem_object_put_unlocked (gobj);return 0 ;
drivers/gpu/drm/virtio/virtgpu_kms.c +0 -9
@@ -173,12 +173,6 @@ int virtio_gpu_init(struct drm_device *dev) goto err_vbufs; } - ret =virtio_gpu_ttm_init (vgdev); -if (ret) { -DRM_ERROR ("failed to init ttm %d\n" , ret); - goto err_ttm; - } -/* get display info */ virtio_cread(vgdev->vdev, struct virtio_gpu_config, num_scanouts, &num_scanouts);
@@ -210,8 +204,6 @@ int virtio_gpu_init(struct drm_device *dev)return 0 ; err_scanouts: -virtio_gpu_ttm_fini (vgdev); -err_ttm:virtio_gpu_free_vbufs (vgdev); err_vbufs: vgdev->vdev->config->del_vqs (vgdev->vdev);
@@ -242,7 +234,6 @@ void virtio_gpu_deinit(struct drm_device *dev) vgdev->vdev->config->del_vqs (vgdev->vdev);virtio_gpu_modeset_fini (vgdev); -virtio_gpu_ttm_fini (vgdev);virtio_gpu_free_vbufs (vgdev);virtio_gpu_cleanup_cap_cache (vgdev);kfree (vgdev->capsets);
drivers/gpu/drm/virtio/virtgpu_object.c +41 -105
202 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_prime.c +0 -37
@@ -30,46 +30,9 @@* device that might share buffers with virtgpu */ -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); -} -struct drm_gem_object *virtgpu_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *table) {return ERR_PTR (-ENODEV ); } - -void *virtgpu_gem_prime_vmap (struct drm_gem_object *obj) -{ -struct virtio_gpu_object *bo =gem_to_virtio_gpu_obj (obj); -int ret; - - ret =virtio_gpu_object_kmap (bo); -if (ret) -return NULL ; -return bo->vmap; -} - -void virtgpu_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr) -{ -virtio_gpu_object_kunmap (gem_to_virtio_gpu_obj (obj)); -} - -int virtgpu_gem_prime_mmap (struct drm_gem_object *obj, -struct vm_area_struct *vma) -{ -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); -}
drivers/gpu/drm/virtio/virtgpu_ttm.c deleted +0 -305
305 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +18 -6
@@ -993,17 +993,21 @@ int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev);struct virtio_gpu_mem_entry *ents;struct scatterlist *sg; -int si, nents; +int si, nents, ret;if (WARN_ON_ONCE (!obj->created))return -EINVAL ; +if (WARN_ON_ONCE (obj->pages)) +return -EINVAL ; -if (!obj->pages) { -int ret; + ret =drm_gem_shmem_pin (&obj->base.base); +if (ret <0 ) +return -EINVAL ; - ret =virtio_gpu_object_get_sg_table (vgdev, obj); -if (ret) -return ret; + obj->pages =drm_gem_shmem_get_sg_table (&obj->base.base); +if (obj->pages ==NULL ) { +drm_gem_shmem_unpin (&obj->base.base); +return -EINVAL ; }if (use_dma_api) {
@@ -1042,6 +1046,9 @@ void virtio_gpu_object_detach(struct virtio_gpu_device *vgdev, {bool use_dma_api = !virtio_has_iommu_quirk (vgdev->vdev); +if (WARN_ON_ONCE (!obj->pages)) +return ; +if (use_dma_api && obj->mapped) {struct virtio_gpu_fence *fence =virtio_gpu_fence_alloc (vgdev);/* detach backing and wait for the host process it ... */
@@ -1057,6 +1064,11 @@ void virtio_gpu_object_detach(struct virtio_gpu_device *vgdev, }else {virtio_gpu_cmd_resource_inval_backing (vgdev, obj->hw_res_handle,NULL ); } + +sg_free_table (obj->pages); + obj->pages =NULL ; + +drm_gem_shmem_unpin (&obj->base.base); } void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_VIRTIO_GPU tristate "Virtio GPU driver" depends on DRM && VIRTIO && MMU select DRM_KMS_HELPER - select DRM_TTM + select DRM_GEM_SHMEM_HELPER help This is the virtual GPU driver for virtio. It can be used with QEMU based VMMs (like KVM or Xen).
drivers/gpu/drm/virtio/Makefile +1 -1
@@ -4,7 +4,7 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o \ - virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \ + virtgpu_display.o virtgpu_vq.o \ virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ virtgpu_ioctl.o virtgpu_prime.o virtgpu_trace_points.o
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 15/18 drm/virtio: remove virtio_gpu_alloc_object
In reply to Gerd HoffmannThin wrapper around virtio_gpu_object_create(),
but calling that directly works equally well.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_gem.c | 23 ++++------------------- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +++--- 3 files changed, 7 insertions(+), 26 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -4
@@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file);void virtio_gpu_gem_object_close (struct drm_gem_object *obj,struct drm_file *file); -struct virtio_gpu_object * -virtio_gpu_alloc_object (struct drm_device *dev, -struct virtio_gpu_object_params *params, -struct virtio_gpu_fence *fence);int virtio_gpu_mode_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args);
drivers/gpu/drm/virtio/virtgpu_gem.c +4 -19
@@ -28,35 +28,20 @@#include "virtgpu_drv.h" -struct virtio_gpu_object * -virtio_gpu_alloc_object (struct drm_device *dev, -struct virtio_gpu_object_params *params, -struct virtio_gpu_fence *fence) -{ -struct virtio_gpu_device *vgdev = dev->dev_private; -struct virtio_gpu_object *obj; -int ret; - - ret =virtio_gpu_object_create (vgdev, params, &obj, fence); -if (ret) -return ERR_PTR (ret); - -return obj; -} -int virtio_gpu_gem_create (struct drm_file *file,struct drm_device *dev,struct virtio_gpu_object_params *params,struct drm_gem_object **obj_p,uint32_t *handle_p) { +struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_object *obj;int ret;u32 handle; - obj =virtio_gpu_alloc_object (dev, params,NULL ); -if (IS_ERR (obj)) -return PTR_ERR (obj); + ret =virtio_gpu_object_create (vgdev, params, &obj,NULL ); +if (ret <0 ) +return ret; ret =drm_gem_handle_create (file, &obj->base.base, &handle);if (ret) {
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -3
@@ -256,10 +256,10 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, fence =virtio_gpu_fence_alloc (vgdev);if (!fence)return -ENOMEM ; - qobj =virtio_gpu_alloc_object (dev, ¶ms, fence); + ret =virtio_gpu_object_create (vgdev, ¶ms, &qobj, fence);dma_fence_put (&fence->f); -if (IS_ERR (qobj)) -return PTR_ERR (qobj); +if (ret <0 ) +return ret; obj = &qobj->base.base; ret =drm_gem_handle_create (file_priv, obj, &handle);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 15/18 drm/virtio: remove virtio_gpu_alloc_object
In reply to Gerd HoffmannThin wrapper around virtio_gpu_object_create(),
but calling that directly works equally well.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_gem.c | 23 ++++------------------- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +++--- 3 files changed, 7 insertions(+), 26 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -4
@@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file);void virtio_gpu_gem_object_close (struct drm_gem_object *obj,struct drm_file *file); -struct virtio_gpu_object * -virtio_gpu_alloc_object (struct drm_device *dev, -struct virtio_gpu_object_params *params, -struct virtio_gpu_fence *fence);int virtio_gpu_mode_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args);
drivers/gpu/drm/virtio/virtgpu_gem.c +4 -19
@@ -28,35 +28,20 @@#include "virtgpu_drv.h" -struct virtio_gpu_object * -virtio_gpu_alloc_object (struct drm_device *dev, -struct virtio_gpu_object_params *params, -struct virtio_gpu_fence *fence) -{ -struct virtio_gpu_device *vgdev = dev->dev_private; -struct virtio_gpu_object *obj; -int ret; - - ret =virtio_gpu_object_create (vgdev, params, &obj, fence); -if (ret) -return ERR_PTR (ret); - -return obj; -} -int virtio_gpu_gem_create (struct drm_file *file,struct drm_device *dev,struct virtio_gpu_object_params *params,struct drm_gem_object **obj_p,uint32_t *handle_p) { +struct virtio_gpu_device *vgdev = dev->dev_private;struct virtio_gpu_object *obj;int ret;u32 handle; - obj =virtio_gpu_alloc_object (dev, params,NULL ); -if (IS_ERR (obj)) -return PTR_ERR (obj); + ret =virtio_gpu_object_create (vgdev, params, &obj,NULL ); +if (ret <0 ) +return ret; ret =drm_gem_handle_create (file, &obj->base.base, &handle);if (ret) {
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -3
@@ -256,10 +256,10 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, fence =virtio_gpu_fence_alloc (vgdev);if (!fence)return -ENOMEM ; - qobj =virtio_gpu_alloc_object (dev, ¶ms, fence); + ret =virtio_gpu_object_create (vgdev, ¶ms, &qobj, fence);dma_fence_put (&fence->f); -if (IS_ERR (qobj)) -return PTR_ERR (qobj); +if (ret <0 ) +return ret; obj = &qobj->base.base; ret =drm_gem_handle_create (file_priv, obj, &handle);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 16/18 drm/virtio: drop virtio_gpu_object_{ref,unref}
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 15 --------------- 1 file changed, 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -15
@@ -363,21 +363,6 @@ struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -static inline struct virtio_gpu_object * -virtio_gpu_object_ref (struct virtio_gpu_object *bo) -{ -drm_gem_object_get (&bo->base.base); -return bo; -} - -static inline void virtio_gpu_object_unref (struct virtio_gpu_object **bo) -{ -if ((*bo) ==NULL ) -return ; -drm_gem_object_put (&(*bo)->base.base); - *bo =NULL ; -} -static inline u64 virtio_gpu_object_mmap_offset (struct virtio_gpu_object *bo) {return drm_vma_node_offset_addr (&bo->base.base.vma_node);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 16/18 drm/virtio: drop virtio_gpu_object_{ref,unref}
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 15 --------------- 1 file changed, 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -15
@@ -363,21 +363,6 @@ struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -static inline struct virtio_gpu_object * -virtio_gpu_object_ref (struct virtio_gpu_object *bo) -{ -drm_gem_object_get (&bo->base.base); -return bo; -} - -static inline void virtio_gpu_object_unref (struct virtio_gpu_object **bo) -{ -if ((*bo) ==NULL ) -return ; -drm_gem_object_put (&(*bo)->base.base); - *bo =NULL ; -} -static inline u64 virtio_gpu_object_mmap_offset (struct virtio_gpu_object *bo) {return drm_vma_node_offset_addr (&bo->base.base.vma_node);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 17/18 drm/virtio: drop virtio_gpu_object_{reserve, unreserve}
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -21
@@ -368,27 +368,6 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo)return drm_vma_node_offset_addr (&bo->base.base.vma_node); } -static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) -{ -int r; - - r =reservation_object_lock_interruptible (bo->base.base.resv,NULL ); -if (unlikely (r !=0 )) { -if (r != -EINTR ) { -struct virtio_gpu_device *qdev = - bo->base.base.dev->dev_private; -dev_err (qdev->dev,"%p reserve failed\n" , bo); - } -return r; - } -return 0 ; -} - -static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) -{ -reservation_object_unlock (bo->base.base.resv); -} -/* virgl debufs */ int virtio_gpu_debugfs_init (struct drm_minor *minor);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 17/18 drm/virtio: drop virtio_gpu_object_{reserve,unreserve}
In reply to Gerd HoffmannNo users left.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -21
@@ -368,27 +368,6 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo)return drm_vma_node_offset_addr (&bo->base.base.vma_node); } -static inline int virtio_gpu_object_reserve (struct virtio_gpu_object *bo) -{ -int r; - - r =reservation_object_lock_interruptible (bo->base.base.resv,NULL ); -if (unlikely (r !=0 )) { -if (r != -EINTR ) { -struct virtio_gpu_device *qdev = - bo->base.base.dev->dev_private; -dev_err (qdev->dev,"%p reserve failed\n" , bo); - } -return r; - } -return 0 ; -} - -static inline void virtio_gpu_object_unreserve (struct virtio_gpu_object *bo) -{ -reservation_object_unlock (bo->base.base.resv); -} -/* virgl debufs */ int virtio_gpu_debugfs_init (struct drm_minor *minor);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v7 18/18 drm/virtio: add fence sanity check
In reply to Gerd HoffmannMake sure we don't leak half-initialized fences outside the driver.
--- drivers/gpu/drm/virtio/virtgpu_fence.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/virtio/virtgpu_fence.c +4 -0
@@ -41,6 +41,10 @@ bool virtio_fence_signaled(struct dma_fence *f) {struct virtio_gpu_fence *fence =to_virtio_fence (f); +if (WARN_ON_ONCE (fence->f.seqno ==0 )) +/* leaked fence outside driver before completing +* initialization with virtio_gpu_fence_emit */ +return false;if (atomic64_read (&fence->drv->last_seq) >= fence->f.seqno)return true;return false;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v7 18/18 drm/virtio: add fence sanity check
In reply to Gerd HoffmannMake sure we don't leak half-initialized fences outside the driver.
--- drivers/gpu/drm/virtio/virtgpu_fence.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/virtio/virtgpu_fence.c +4 -0
@@ -41,6 +41,10 @@ bool virtio_fence_signaled(struct dma_fence *f) {struct virtio_gpu_fence *fence =to_virtio_fence (f); +if (WARN_ON_ONCE (fence->f.seqno ==0 )) +/* leaked fence outside driver before completing +* initialization with virtio_gpu_fence_emit */ +return false;if (atomic64_read (&fence->drv->last_seq) >= fence->f.seqno)return true;return false;
Signature · 1 line
2.18.1