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>,
Gerd Hoffmann <kraxel@redhat.com>,
"open list:VIRTIO GPU DRIVER"
<virtualization@lists.linux-foundation.org>
Subject: [PATCH v2 06/12] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve}
Date: Tue, 18 Jun 2019 15:58:14 +0200 [thread overview]
Message-ID: <20190618135821.8644-7-kraxel@redhat.com> (raw)
In-Reply-To: <20190618135821.8644-1-kraxel@redhat.com>
Call reservation_object_* directly instead
of using ttm_bo_{reserve,unreserve}.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 06cc0e961df6..91c320819a8c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -402,7 +402,7 @@ 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) {
struct virtio_gpu_device *qdev =
@@ -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 */
--
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-06-18 13:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 13:58 [PATCH v2 00/12] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 01/12] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 02/12] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann
2019-06-18 14:07 ` Daniel Vetter
2019-06-18 13:58 ` [PATCH v2 03/12] drm/virtio: simplify cursor updates Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 04/12] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 05/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann
2019-06-18 13:58 ` Gerd Hoffmann [this message]
2019-06-18 14:09 ` [PATCH v2 06/12] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Daniel Vetter
2019-06-18 13:58 ` [PATCH v2 07/12] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann
2019-06-18 14:16 ` Daniel Vetter
2019-06-18 14:23 ` Daniel Vetter
2019-06-18 13:58 ` [PATCH v2 08/12] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann
2019-06-18 14:24 ` Daniel Vetter
2019-06-18 13:58 ` [PATCH v2 09/12] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 10/12] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 11/12] drm/virtio: rework virtio_gpu_object_create fencing even more Gerd Hoffmann
2019-06-18 13:58 ` [PATCH v2 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=20190618135821.8644-7-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--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;
as well as URLs for NNTP newsgroup(s).