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 v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Date: Tue, 2 Jul 2019 16:18:51 +0200 [thread overview] Message-ID: <20190702141903.1131-7-kraxel@redhat.com> (raw) In-Reply-To: <20190702141903.1131-1-kraxel@redhat.com> Call reservation_object_* directly instead of using ttm_bo_{reserve,unreserve}. v4: check for EINTR only. v3: check for EINTR too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 06cc0e961df6..07f6001ea91e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -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 */ -- 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 v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Date: Tue, 2 Jul 2019 16:18:51 +0200 [thread overview] Message-ID: <20190702141903.1131-7-kraxel@redhat.com> (raw) In-Reply-To: <20190702141903.1131-1-kraxel@redhat.com> Call reservation_object_* directly instead of using ttm_bo_{reserve,unreserve}. v4: check for EINTR only. v3: check for EINTR too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 06cc0e961df6..07f6001ea91e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -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 */ -- 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-07-02 14:19 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-02 14:18 [PATCH v6 00/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 01/18] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 02/18] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 03/18] drm/virtio: simplify cursor updates Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 04/18] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 05/18] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann [this message] 2019-07-02 14:18 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann 2019-07-03 18:02 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Chia-I Wu 2019-07-03 18:02 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Chia-I Wu 2019-07-04 11:10 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann 2019-07-04 11:10 ` Gerd Hoffmann 2019-07-04 11:10 ` Gerd Hoffmann 2019-07-04 19:17 ` Chia-I Wu 2019-07-04 19:17 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Chia-I Wu 2019-07-05 8:53 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann 2019-07-05 8:53 ` Gerd Hoffmann 2019-07-05 8:53 ` Gerd Hoffmann 2019-07-07 5:30 ` Chia-I Wu 2019-07-07 5:30 ` [PATCH v6 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Chia-I Wu 2019-07-07 5:30 ` Chia-I Wu 2019-07-04 19:17 ` Chia-I Wu 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 07/18] drm/virtio: add virtio_gpu_object_array & helpers Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-03 18:31 ` Chia-I Wu 2019-07-03 18:31 ` Chia-I Wu 2019-07-03 18:31 ` Chia-I Wu 2019-07-03 19:52 ` Chia-I Wu 2019-07-03 19:52 ` Chia-I Wu 2019-07-03 19:52 ` Chia-I Wu 2019-07-04 11:19 ` Gerd Hoffmann 2019-07-04 11:19 ` Gerd Hoffmann 2019-07-04 11:19 ` Gerd Hoffmann 2019-07-04 11:11 ` Gerd Hoffmann 2019-07-04 11:11 ` Gerd Hoffmann 2019-07-04 11:11 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 08/18] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-03 18:49 ` Chia-I Wu 2019-07-03 18:49 ` Chia-I Wu 2019-07-04 11:25 ` Gerd Hoffmann 2019-07-04 11:25 ` Gerd Hoffmann 2019-07-04 18:46 ` Chia-I Wu 2019-07-04 18:46 ` Chia-I Wu 2019-07-11 2:35 ` Chia-I Wu 2019-07-11 2:35 ` Chia-I Wu 2019-07-11 2:35 ` Chia-I Wu 2019-07-04 11:25 ` Gerd Hoffmann 2019-07-03 18:49 ` Chia-I Wu 2019-07-02 14:18 ` [PATCH v6 09/18] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 10/18] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 11/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-04 13:33 ` Emil Velikov 2019-07-04 13:33 ` Emil Velikov 2019-07-04 13:33 ` Emil Velikov 2019-07-17 6:04 ` Chia-I Wu 2019-07-17 6:04 ` Chia-I Wu 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 12/18] drm/virtio: remove virtio_gpu_alloc_object Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 13/18] drm/virtio: drop virtio_gpu_object_{ref,unref} Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:18 ` [PATCH v6 14/18] drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-03 20:05 ` Chia-I Wu 2019-07-03 20:05 ` Chia-I Wu 2019-07-04 11:47 ` Gerd Hoffmann 2019-07-04 11:47 ` Gerd Hoffmann 2019-07-04 11:47 ` Gerd Hoffmann 2019-07-04 18:55 ` Chia-I Wu 2019-07-04 18:55 ` Chia-I Wu 2019-07-04 18:55 ` Chia-I Wu 2019-07-05 9:01 ` Gerd Hoffmann 2019-07-05 9:01 ` Gerd Hoffmann 2019-07-05 9:01 ` Gerd Hoffmann 2019-07-02 14:18 ` Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 15/18] drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing Gerd Hoffmann 2019-07-02 14:19 ` Gerd Hoffmann 2019-07-03 19:55 ` Chia-I Wu 2019-07-03 19:55 ` Chia-I Wu 2019-07-03 19:55 ` Chia-I Wu 2019-07-04 11:51 ` Gerd Hoffmann 2019-07-04 11:51 ` Gerd Hoffmann 2019-07-04 11:51 ` Gerd Hoffmann 2019-07-04 19:08 ` Chia-I Wu 2019-07-04 19:08 ` Chia-I Wu 2019-07-04 19:08 ` Chia-I Wu 2019-07-05 9:05 ` Gerd Hoffmann 2019-07-05 9:05 ` Gerd Hoffmann 2019-07-05 9:05 ` Gerd Hoffmann 2019-07-05 14:07 ` Gerd Hoffmann 2019-07-05 14:07 ` Gerd Hoffmann 2019-07-02 14:19 ` Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 16/18] drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 16/18] drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource Gerd Hoffmann 2019-07-03 0:08 ` Gurchetan Singh 2019-07-03 0:08 ` Gurchetan Singh 2019-07-04 12:00 ` [PATCH v6 16/18] drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource Gerd Hoffmann 2019-07-04 12:00 ` Gerd Hoffmann 2019-07-04 12:00 ` Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 16/18] drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 17/18] drm/virtio: drop virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 17/18] drm/virtio: drop virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 17/18] drm/virtio: drop virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann 2019-07-02 14:19 ` [PATCH v6 18/18] drm/virtio: add fence sanity check Gerd Hoffmann 2019-07-02 14:19 ` Gerd Hoffmann 2019-07-02 14:19 ` 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=20190702141903.1131-7-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.