Commit b33651a5 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/qxl: Do not pin buffer objects for vmap

Pin and vmap are distinct operations. Do not perform a pin as part
of the vmap call. This used to be necessary to keep the fbdev buffer
in place while it is being updated. Fbdev emulation has meanwhile
been fixed to lock the buffer correctly. Same for vunmap.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> # virtio-gpu
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240227113853.8464-14-tzimmermann@suse.de
parent fe36f151
...@@ -164,10 +164,6 @@ int qxl_bo_vmap_locked(struct qxl_bo *bo, struct iosys_map *map) ...@@ -164,10 +164,6 @@ int qxl_bo_vmap_locked(struct qxl_bo *bo, struct iosys_map *map)
goto out; goto out;
} }
r = qxl_bo_pin_locked(bo);
if (r)
return r;
r = ttm_bo_vmap(&bo->tbo, &bo->map); r = ttm_bo_vmap(&bo->tbo, &bo->map);
if (r) { if (r) {
qxl_bo_unpin_locked(bo); qxl_bo_unpin_locked(bo);
...@@ -243,7 +239,6 @@ void qxl_bo_vunmap_locked(struct qxl_bo *bo) ...@@ -243,7 +239,6 @@ void qxl_bo_vunmap_locked(struct qxl_bo *bo)
return; return;
bo->kptr = NULL; bo->kptr = NULL;
ttm_bo_vunmap(&bo->tbo, &bo->map); ttm_bo_vunmap(&bo->tbo, &bo->map);
qxl_bo_unpin_locked(bo);
} }
int qxl_bo_vunmap(struct qxl_bo *bo) int qxl_bo_vunmap(struct qxl_bo *bo)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment