From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: olvaffe@gmail.com, gurchetansingh@chromium.org, Gerd Hoffmann <kraxel@redhat.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, virtualization@lists.linux-foundation.org (open list:VIRTIO GPU DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 13/18] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Date: Thu, 29 Aug 2019 12:32:56 +0200 [thread overview] Message-ID: <20190829103301.3539-14-kraxel@redhat.com> (raw) In-Reply-To: <20190829103301.3539-1-kraxel@redhat.com> No users left. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 -- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 39 -------------------------- 2 files changed, 42 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index d5ef2514d2bd..1266a8e64961 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -223,9 +223,6 @@ struct virtio_gpu_fpriv { /* virtio_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10 extern 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); diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 677d844d88bc..e36ab3d6d162 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -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. -- 2.18.1
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: David Airlie <airlied@linux.ie>, open list <linux-kernel@vger.kernel.org>, "open list:VIRTIO GPU DRIVER" <virtualization@lists.linux-foundation.org>, Gerd Hoffmann <kraxel@redhat.com>, gurchetansingh@chromium.org Subject: [PATCH v9 13/18] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Date: Thu, 29 Aug 2019 12:32:56 +0200 [thread overview] Message-ID: <20190829103301.3539-14-kraxel@redhat.com> (raw) In-Reply-To: <20190829103301.3539-1-kraxel@redhat.com> No users left. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 -- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 39 -------------------------- 2 files changed, 42 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index d5ef2514d2bd..1266a8e64961 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -223,9 +223,6 @@ struct virtio_gpu_fpriv { /* virtio_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10 extern 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); diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 677d844d88bc..e36ab3d6d162 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -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. -- 2.18.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-08-29 10:33 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-29 10:32 [PATCH v9 00/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 01/18] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 02/18] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 03/18] drm/virtio: simplify cursor updates Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 04/18] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 05/18] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 07/18] drm/virtio: add virtio_gpu_object_array & helpers Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 08/18] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 09/18] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 10/18] drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 11/18] drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 12/18] drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 12/18] drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 13/18] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann [this message] 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 14/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 15/18] drm/virtio: remove virtio_gpu_alloc_object Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` [PATCH v9 16/18] drm/virtio: drop virtio_gpu_object_{ref,unref} Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:32 ` Gerd Hoffmann 2019-08-29 10:33 ` [PATCH v9 17/18] drm/virtio: drop virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann 2019-08-29 10:33 ` Gerd Hoffmann 2019-08-29 10:33 ` [PATCH v9 17/18] drm/virtio: drop virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann 2019-08-29 10:33 ` [PATCH v9 18/18] drm/virtio: add fence sanity check Gerd Hoffmann 2019-08-29 10:33 ` Gerd Hoffmann 2019-08-29 10:33 ` Gerd Hoffmann 2019-08-29 23:44 ` [PATCH v9 00/18] drm/virtio: switch from ttm to gem shmem helpers Chia-I Wu 2019-08-30 6:01 ` Gerd Hoffmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190829103301.3539-14-kraxel@redhat.com \ --to=kraxel@redhat.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=gurchetansingh@chromium.org \ --cc=linux-kernel@vger.kernel.org \ --cc=olvaffe@gmail.com \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.