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 v4 03/12] drm/virtio: simplify cursor updates
Date: Thu, 20 Jun 2019 08:07:17 +0200 [thread overview]
Message-ID: <20190620060726.926-4-kraxel@redhat.com> (raw)
In-Reply-To: <20190620060726.926-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 024c2aa0c929..4b805bf466d3 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -184,7 +184,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);
@@ -208,15 +207,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) {
- reservation_object_add_excl_fence(bo->tbo.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-06-20 6:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 6:07 [PATCH v4 00/12] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 01/12] drm/virtio: pass gem reservation object to ttm init Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 02/12] drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper Gerd Hoffmann
2019-06-26 23:55 ` Chia-I Wu
2019-06-28 10:05 ` Gerd Hoffmann
2019-06-30 18:56 ` Chia-I Wu
2019-06-20 6:07 ` Gerd Hoffmann [this message]
2019-06-20 6:07 ` [PATCH v4 04/12] drm/virtio: remove virtio_gpu_object_wait Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 05/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 06/12] drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 07/12] drm/virtio: add virtio_gpu_object_array & helpers Gerd Hoffmann
2019-06-27 0:49 ` Chia-I Wu
2019-06-20 6:07 ` [PATCH v4 08/12] drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing Gerd Hoffmann
2019-06-27 1:32 ` Chia-I Wu
2019-06-28 10:34 ` Gerd Hoffmann
2019-06-30 18:47 ` Chia-I Wu
2019-06-20 6:07 ` [PATCH v4 09/12] drm/virtio: rework virtio_gpu_object_create fencing Gerd Hoffmann
2019-06-27 1:44 ` Chia-I Wu
2019-06-20 6:07 ` [PATCH v4 10/12] drm/virtio: drop virtio_gpu_object_list_validate/virtio_gpu_unref_list Gerd Hoffmann
2019-06-20 6:07 ` [PATCH v4 11/12] drm/virtio: switch from ttm to gem shmem helpers Gerd Hoffmann
2019-06-27 4:47 ` Chia-I Wu
2019-06-28 10:49 ` Gerd Hoffmann
2019-06-30 18:42 ` Chia-I Wu
2019-06-20 6:07 ` [PATCH v4 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=20190620060726.926-4-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).