8002db6336
The recent addition of lockdep support to reservations and their subsequent use by TTM showed up a number of potential problems with the way qxl was using TTM objects. a) it was allocating objects, and reserving them later without validating underneath the reservation, which meant in extreme conditions the objects could be evicted before the reservation ever used them. b) it was reserving objects straight after allocating them, but with no ability to back off should the reservations fail. It now allocates the necessary objects then does a complete reservation pass on them to avoid deadlocks. c) it had two lists per release tracking objects, unnecessary complicating the reservation process. This patch removes the dual object tracking, adds reservations ticket support to the release and fence object handling. It then ports the internal fb drawing code and the userspace facing ioctl to use the new interfaces properly, along with cleanup up the error path handling in some codepaths. Signed-off-by: Dave Airlie <airlied@redhat.com>
106 lines
3.3 KiB
C
106 lines
3.3 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, bool no_wait)
|
|
{
|
|
int r;
|
|
|
|
r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
|
|
if (unlikely(r != 0)) {
|
|
if (r != -ERESTARTSYS) {
|
|
struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private;
|
|
dev_err(qdev->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 u64 qxl_bo_gpu_offset(struct qxl_bo *bo)
|
|
{
|
|
return bo->tbo.offset;
|
|
}
|
|
|
|
static inline unsigned long qxl_bo_size(struct qxl_bo *bo)
|
|
{
|
|
return bo->tbo.num_pages << PAGE_SHIFT;
|
|
}
|
|
|
|
static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)
|
|
{
|
|
return bo->tbo.addr_space_offset;
|
|
}
|
|
|
|
static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type,
|
|
bool no_wait)
|
|
{
|
|
int r;
|
|
|
|
r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
|
|
if (unlikely(r != 0)) {
|
|
if (r != -ERESTARTSYS) {
|
|
struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private;
|
|
dev_err(qdev->dev, "%p reserve failed for wait\n",
|
|
bo);
|
|
}
|
|
return r;
|
|
}
|
|
spin_lock(&bo->tbo.bdev->fence_lock);
|
|
if (mem_type)
|
|
*mem_type = bo->tbo.mem.mem_type;
|
|
if (bo->tbo.sync_obj)
|
|
r = ttm_bo_wait(&bo->tbo, true, true, no_wait);
|
|
spin_unlock(&bo->tbo.bdev->fence_lock);
|
|
ttm_bo_unreserve(&bo->tbo);
|
|
return r;
|
|
}
|
|
|
|
extern int qxl_bo_create(struct qxl_device *qdev,
|
|
unsigned long size,
|
|
bool kernel, bool pinned, u32 domain,
|
|
struct qxl_surface *surf,
|
|
struct qxl_bo **bo_ptr);
|
|
extern int qxl_bo_kmap(struct qxl_bo *bo, void **ptr);
|
|
extern void qxl_bo_kunmap(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(struct qxl_bo *bo, u32 domain, u64 *gpu_addr);
|
|
extern int qxl_bo_unpin(struct qxl_bo *bo);
|
|
extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned);
|
|
extern bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo);
|
|
|
|
#endif
|