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 05/18] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Date: Thu, 29 Aug 2019 12:32:48 +0200 [thread overview] Message-ID: <20190829103301.3539-6-kraxel@redhat.com> (raw) In-Reply-To: <20190829103301.3539-1-kraxel@redhat.com> All callers pass no_wait = false. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- 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(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 3e0a53309c5b..d886c0e3502a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -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.base.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 = diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 292566146814..6fe6f72f64d1 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -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; diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index a662394f6892..7f1775b9449e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -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; -- 2.18.1
WARNING: multiple messages have this Message-ID (diff)
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>, "open list:VIRTIO GPU DRIVER" <virtualization@lists.linux-foundation.org>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH v9 05/18] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Date: Thu, 29 Aug 2019 12:32:48 +0200 [thread overview] Message-ID: <20190829103301.3539-6-kraxel@redhat.com> (raw) In-Reply-To: <20190829103301.3539-1-kraxel@redhat.com> All callers pass no_wait = false. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- 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(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 3e0a53309c5b..d886c0e3502a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -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.base.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 = diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 292566146814..6fe6f72f64d1 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -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; diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index a662394f6892..7f1775b9449e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -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; -- 2.18.1
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 [this message] 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 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-6-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.