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 v8 03/18] drm/virtio: simplify cursor updates
Date: Fri, 23 Aug 2019 11:54:48 +0200 [thread overview]
Message-ID: <20190823095503.2261-4-kraxel@redhat.com> (raw)
In-Reply-To: <20190823095503.2261-1-kraxel@redhat.com>
No need to do the reservation dance,
we can just wait on the fence directly.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/virtio/virtgpu_plane.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index a492ac3f4a7e..11539b66c6f2 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -186,7 +186,6 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
struct virtio_gpu_framebuffer *vgfb;
struct virtio_gpu_object *bo = NULL;
uint32_t handle;
- int ret = 0;
if (plane->state->crtc)
output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
@@ -210,15 +209,9 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
cpu_to_le32(plane->state->crtc_w),
cpu_to_le32(plane->state->crtc_h),
0, 0, vgfb->fence);
- ret = virtio_gpu_object_reserve(bo, false);
- if (!ret) {
- dma_resv_add_excl_fence(bo->tbo.base.resv,
- &vgfb->fence->f);
- dma_fence_put(&vgfb->fence->f);
- vgfb->fence = NULL;
- virtio_gpu_object_unreserve(bo);
- virtio_gpu_object_wait(bo, false);
- }
+ dma_fence_wait(&vgfb->fence->f, true);
+ dma_fence_put(&vgfb->fence->f);
+ vgfb->fence = NULL;
}
if (plane->state->fb != old_state->fb) {
--
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 v8 03/18] drm/virtio: simplify cursor updates
Date: Fri, 23 Aug 2019 11:54:48 +0200 [thread overview]
Message-ID: <20190823095503.2261-4-kraxel@redhat.com> (raw)
In-Reply-To: <20190823095503.2261-1-kraxel@redhat.com>
No need to do the reservation dance,
we can just wait on the fence directly.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/virtio/virtgpu_plane.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index a492ac3f4a7e..11539b66c6f2 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -186,7 +186,6 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
struct virtio_gpu_framebuffer *vgfb;
struct virtio_gpu_object *bo = NULL;
uint32_t handle;
- int ret = 0;
if (plane->state->crtc)
output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
@@ -210,15 +209,9 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
cpu_to_le32(plane->state->crtc_w),
cpu_to_le32(plane->state->crtc_h),
0, 0, vgfb->fence);
- ret = virtio_gpu_object_reserve(bo, false);
- if (!ret) {
- dma_resv_add_excl_fence(bo->tbo.base.resv,
- &vgfb->fence->f);
- dma_fence_put(&vgfb->fence->f);
- vgfb->fence = NULL;
- virtio_gpu_object_unreserve(bo);
- virtio_gpu_object_wait(bo, false);
- }
+ dma_fence_wait(&vgfb->fence->f, true);
+ dma_fence_put(&vgfb->fence->f);
+ vgfb->fence = NULL;
}
if (plane->state->fb != old_state->fb) {
--
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-23 9:56 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 9:54 [PATCH v8 00/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 01/18] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 02/18] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-28 21:13 ` Chia-I Wu
2019-08-28 21:13 ` Chia-I Wu
2019-08-28 21:13 ` Chia-I Wu
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 03/18] drm/virtio: simplify cursor updates Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann [this message]
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 04/18] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 05/18] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 06/18] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 07/18] drm/virtio: add virtio_gpu_object_array & helpers Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-28 21:27 ` Chia-I Wu
2019-08-28 21:27 ` Chia-I Wu
2019-08-28 21:27 ` Chia-I Wu
2019-08-23 9:54 ` [PATCH v8 08/18] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 09/18] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 10/18] drm/virtio: rework virtio_gpu_transfer_from_host_ioctl fencing Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 11/18] drm/virtio: rework virtio_gpu_transfer_to_host_ioctl fencing Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 12/18] drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 12/18] drm/virtio: rework virtio_gpu_cmd_context_{attach,detach}_resource Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 13/18] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` [PATCH v8 14/18] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:54 ` Gerd Hoffmann
2019-08-23 9:55 ` [PATCH v8 15/18] drm/virtio: remove virtio_gpu_alloc_object Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` [PATCH v8 16/18] drm/virtio: drop virtio_gpu_object_{ref,unref} Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` [PATCH v8 17/18] drm/virtio: drop virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann
2019-08-23 9:55 ` [PATCH v8 17/18] drm/virtio: drop virtio_gpu_object_{reserve,unreserve} Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` [PATCH v8 18/18] drm/virtio: add fence sanity check Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-23 9:55 ` Gerd Hoffmann
2019-08-28 23:14 ` [PATCH v8 00/18] drm/virtio: switch from ttm to gem shmem helpers Chia-I Wu
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=20190823095503.2261-4-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: link
Be 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.