From: Thomas Zimmermann <tzimmermann@suse.de>
To: Gerd Hoffmann <kraxel@redhat.com>, dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>,
open list <linux-kernel@vger.kernel.org>,
"open list:DRM DRIVER FOR QXL VIRTUAL GPU"
<virtualization@lists.linux-foundation.org>,
"open list:DRM DRIVER FOR QXL VIRTUAL GPU"
<spice-devel@lists.freedesktop.org>,
Dave Airlie <airlied@redhat.com>
Subject: Re: [PATCH 06/10] drm/qxl: add qxl_bo_kmap/qxl_bo_kunmap
Date: Tue, 16 Feb 2021 14:17:24 +0100 [thread overview]
Message-ID: <72d297c4-1a93-aa4f-88c4-721818cfc33b@suse.de> (raw)
In-Reply-To: <20210216113716.716996-7-kraxel@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 3053 bytes --]
Hi
Am 16.02.21 um 12:37 schrieb Gerd Hoffmann:
> Add kmap/kunmap variants which reserve (and pin) the bo.
> They can be used in case the caller doesn't hold a reservation
> for the bo.
Again, these functions should rather be called vmap/vunamp.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> drivers/gpu/drm/qxl/qxl_object.h | 2 ++
> drivers/gpu/drm/qxl/qxl_object.c | 36 ++++++++++++++++++++++++++++++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h
> index 5bd33650183f..360972ae4869 100644
> --- a/drivers/gpu/drm/qxl/qxl_object.h
> +++ b/drivers/gpu/drm/qxl/qxl_object.h
> @@ -64,7 +64,9 @@ extern int qxl_bo_create(struct qxl_device *qdev,
> u32 priority,
> struct qxl_surface *surf,
> struct qxl_bo **bo_ptr);
> +extern int qxl_bo_kmap(struct qxl_bo *bo, struct dma_buf_map *map);
> extern int qxl_bo_kmap_locked(struct qxl_bo *bo, struct dma_buf_map *map);
> +extern int qxl_bo_kunmap(struct qxl_bo *bo);
> extern void qxl_bo_kunmap_locked(struct qxl_bo *bo);
> void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, struct qxl_bo *bo, int page_offset);
> void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev, struct qxl_bo *bo, void *map);
> diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
> index b56d4dfc28cb..22748b9566af 100644
> --- a/drivers/gpu/drm/qxl/qxl_object.c
> +++ b/drivers/gpu/drm/qxl/qxl_object.c
> @@ -29,6 +29,9 @@
> #include "qxl_drv.h"
> #include "qxl_object.h"
>
> +static int __qxl_bo_pin(struct qxl_bo *bo);
> +static void __qxl_bo_unpin(struct qxl_bo *bo);
> +
> static void qxl_ttm_bo_destroy(struct ttm_buffer_object *tbo)
> {
> struct qxl_bo *bo;
> @@ -179,6 +182,25 @@ int qxl_bo_kmap_locked(struct qxl_bo *bo, struct dma_buf_map *map)
> return 0;
> }
>
> +int qxl_bo_kmap(struct qxl_bo *bo, struct dma_buf_map *map)
> +{
> + int r;
> +
> + r = qxl_bo_reserve(bo);
> + if (r)
> + return r;
> +
> + r = __qxl_bo_pin(bo);
> + if (r) {
> + qxl_bo_unreserve(bo);
> + return r;
> + }
> +
> + r = qxl_bo_kmap_locked(bo, map);
> + qxl_bo_unreserve(bo);
> + return r;
> +}
> +
> void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev,
> struct qxl_bo *bo, int page_offset)
> {
> @@ -223,6 +245,20 @@ void qxl_bo_kunmap_locked(struct qxl_bo *bo)
> ttm_bo_vunmap(&bo->tbo, &bo->map);
> }
>
> +int qxl_bo_kunmap(struct qxl_bo *bo)
> +{
> + int r;
> +
> + r = qxl_bo_reserve(bo);
> + if (r)
> + return r;
> +
> + qxl_bo_kunmap_locked(bo);
> + __qxl_bo_unpin(bo);
> + qxl_bo_unreserve(bo);
> + return 0;
> +}
> +
> void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
> struct qxl_bo *bo, void *pmap)
> {
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
next prev parent reply other threads:[~2021-02-16 13:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210216113716.716996-1-kraxel@redhat.com>
2021-02-16 11:37 ` [PATCH 01/10] drm/qxl: properly handle device init failures Gerd Hoffmann
2021-02-16 13:08 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 02/10] drm/qxl: more fence wait rework Gerd Hoffmann
2021-02-16 11:37 ` [PATCH 03/10] drm/qxl: use ttm bo priorities Gerd Hoffmann
2021-02-16 11:37 ` [PATCH 04/10] drm/qxl: fix lockdep issue in qxl_alloc_release_reserved Gerd Hoffmann
2021-02-16 11:37 ` [PATCH 05/10] drm/qxl: rename qxl_bo_kmap -> qxl_bo_kmap_locked Gerd Hoffmann
2021-02-16 13:14 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 06/10] drm/qxl: add qxl_bo_kmap/qxl_bo_kunmap Gerd Hoffmann
2021-02-16 13:17 ` Thomas Zimmermann [this message]
2021-02-16 11:37 ` [PATCH 07/10] drm/qxl: fix prime kmap Gerd Hoffmann
2021-02-16 13:16 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 08/10] drm/qxl: fix monitors object kmap Gerd Hoffmann
2021-02-16 13:18 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 09/10] drm/qxl: map/unmap framebuffers in prepare_fb+cleanup_fb callbacks Gerd Hoffmann
2021-02-16 13:27 ` Thomas Zimmermann
2021-02-16 13:46 ` Thomas Zimmermann
2021-02-17 10:02 ` Gerd Hoffmann
2021-02-17 10:23 ` Thomas Zimmermann
2021-02-16 11:37 ` [PATCH 10/10] drm/qxl: add lock asserts to qxl_bo_kmap_locked + qxl_bo_kunmap_locked Gerd Hoffmann
2021-02-16 13:30 ` Thomas Zimmermann
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=72d297c4-1a93-aa4f-88c4-721818cfc33b@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.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).