mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 23:21:31 +00:00
c537fb4e3d
Add qxl_bo_pin_and_vmap() that pins and vmaps a buffer object in one step. Update callers of the regular qxl_bo_vmap(). Fixes a bug where qxl accesses an unpinned buffer object while it is being moved; such as with the monitor-description BO. An typical error is shown below. [ 4.303586] [drm:drm_atomic_helper_commit_planes] *ERROR* head 1 wrong: 65376256x16777216+0+0 [ 4.586883] [drm:drm_atomic_helper_commit_planes] *ERROR* head 1 wrong: 65376256x16777216+0+0 [ 4.904036] [drm:drm_atomic_helper_commit_planes] *ERROR* head 1 wrong: 65335296x16777216+0+0 [ 5.374347] [drm:qxl_release_from_id_locked] *ERROR* failed to find id in release_idr Commitb33651a5c9("drm/qxl: Do not pin buffer objects for vmap") removed the implicit pin operation from qxl's vmap code. This is the correct behavior for GEM and PRIME interfaces, but the pin is still needed for qxl internal operation. Also add a corresponding function qxl_bo_vunmap_and_unpin() and remove the old qxl_bo_vmap() helpers. Future directions: BOs should not be pinned or vmapped unnecessarily. The pin-and-vmap operation should be removed from the driver and a temporary mapping should be established with a vmap_local-like helper. See the client helper drm_client_buffer_vmap_local() for semantics. v2: - unreserve BO on errors in qxl_bo_pin_and_vmap() (Dmitry) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes:b33651a5c9("drm/qxl: Do not pin buffer objects for vmap") Reported-by: David Kaplan <david.kaplan@amd.com> Closes: https://lore.kernel.org/dri-devel/ab0fb17d-0f96-4ee6-8b21-65d02bb02655@suse.de/ Tested-by: David Kaplan <david.kaplan@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> Cc: Christian König <christian.koenig@amd.com> Cc: Zack Rusin <zack.rusin@broadcom.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: virtualization@lists.linux.dev Cc: spice-devel@lists.freedesktop.org Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Reviewed-by: Zack Rusin <zack.rusin@broadcom.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240708142208.194361-1-tzimmermann@suse.de
78 lines
2.7 KiB
C
78 lines
2.7 KiB
C
/*
|
|
* Copyright 2013 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Dave Airlie
|
|
* Alon Levy
|
|
*/
|
|
#ifndef QXL_OBJECT_H
|
|
#define QXL_OBJECT_H
|
|
|
|
#include "qxl_drv.h"
|
|
|
|
static inline int qxl_bo_reserve(struct qxl_bo *bo)
|
|
{
|
|
int r;
|
|
|
|
r = ttm_bo_reserve(&bo->tbo, true, false, NULL);
|
|
if (unlikely(r != 0)) {
|
|
if (r != -ERESTARTSYS) {
|
|
struct drm_device *ddev = bo->tbo.base.dev;
|
|
|
|
dev_err(ddev->dev, "%p reserve failed\n", bo);
|
|
}
|
|
return r;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline void qxl_bo_unreserve(struct qxl_bo *bo)
|
|
{
|
|
ttm_bo_unreserve(&bo->tbo);
|
|
}
|
|
|
|
static inline unsigned long qxl_bo_size(struct qxl_bo *bo)
|
|
{
|
|
return bo->tbo.base.size;
|
|
}
|
|
|
|
extern int qxl_bo_create(struct qxl_device *qdev,
|
|
unsigned long size,
|
|
bool kernel, bool pinned, u32 domain,
|
|
u32 priority,
|
|
struct qxl_surface *surf,
|
|
struct qxl_bo **bo_ptr);
|
|
int qxl_bo_pin_and_vmap(struct qxl_bo *bo, struct iosys_map *map);
|
|
int qxl_bo_vmap_locked(struct qxl_bo *bo, struct iosys_map *map);
|
|
int qxl_bo_vunmap_and_unpin(struct qxl_bo *bo);
|
|
void qxl_bo_vunmap_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);
|
|
extern struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo);
|
|
extern void qxl_bo_unref(struct qxl_bo **bo);
|
|
extern int qxl_bo_pin_locked(struct qxl_bo *bo);
|
|
extern void qxl_bo_unpin_locked(struct qxl_bo *bo);
|
|
extern int qxl_bo_pin(struct qxl_bo *bo);
|
|
extern int qxl_bo_unpin(struct qxl_bo *bo);
|
|
extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain);
|
|
extern bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo);
|
|
|
|
#endif
|