From: Daniel Vetter <daniel@ffwll.ch>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org, 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: Re: [PATCH v3 06/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve
Date: Wed, 19 Jun 2019 12:55:44 +0200 [thread overview]
Message-ID: <20190619105543.GN12905@phenom.ffwll.local> (raw)
In-Reply-To: <20190619090420.6667-7-kraxel@redhat.com>
On Wed, Jun 19, 2019 at 11:04:14AM +0200, Gerd Hoffmann wrote:
> 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 2cd96256ba37..06cc0e961df6 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.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 1e49e08dd545..9c9ad3b14080 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_gem.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
> @@ -140,7 +140,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;
>
> @@ -161,7 +161,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 313c770ea2c5..5cffd2e54c04 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> @@ -375,7 +375,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;
>
> @@ -425,7 +425,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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2019-06-19 10:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190619090420.6667-1-kraxel@redhat.com>
2019-06-19 9:04 ` [PATCH v3 01/12] drm: add gem array helpers Gerd Hoffmann
2019-06-19 10:32 ` Emil Velikov
2019-06-19 11:27 ` Gerd Hoffmann
2019-06-19 10:54 ` Daniel Vetter
2019-06-19 9:04 ` [PATCH v3 02/12] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 03/12] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 04/12] drm/virtio: simplify cursor updates Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 05/12] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 06/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann
2019-06-19 10:55 ` Daniel Vetter [this message]
2019-06-19 9:04 ` [PATCH v3 07/12] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann
2019-06-19 9:57 ` Daniel Vetter
2019-06-19 9:04 ` [PATCH v3 08/12] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann
2019-06-19 11:09 ` Daniel Vetter
2019-06-20 6:01 ` Gerd Hoffmann
2019-06-27 5:24 ` Chia-I Wu
2019-06-19 9:04 ` [PATCH v3 09/12] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 10/12] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann
2019-06-19 9:04 ` [PATCH v3 11/12] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-06-19 10:40 ` Emil Velikov
2019-06-19 9:04 ` [PATCH v3 12/12] drm/virtio: remove virtio_gpu_alloc_object 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=20190619105543.GN12905@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox