31,8 → 31,6 |
#include <drm/radeon_drm.h> |
#include "radeon.h" |
|
struct sg_table; |
|
/** |
* radeon_mem_type_to_domain - return domain corresponding to mem_type |
* @mem_type: ttm memory type |
54,11 → 52,31 |
return 0; |
} |
|
int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr); |
/** |
* radeon_bo_reserve - reserve bo |
* @bo: bo structure |
* @no_intr: don't return -ERESTARTSYS on pending signal |
* |
* Returns: |
* -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by |
* a signal. Release all buffer reservations and return to user-space. |
*/ |
static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr) |
{ |
int r; |
|
r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, NULL); |
if (unlikely(r != 0)) { |
if (r != -ERESTARTSYS) |
dev_err(bo->rdev->dev, "%p reserve failed\n", bo); |
return r; |
} |
return 0; |
} |
|
static inline void radeon_bo_unreserve(struct radeon_bo *bo) |
{ |
// ttm_bo_unreserve(&bo->tbo); |
ttm_bo_unreserve(&bo->tbo); |
} |
|
/** |
80,15 → 98,6 |
return bo->tbo.num_pages << PAGE_SHIFT; |
} |
|
static inline bool radeon_bo_is_reserved(struct radeon_bo *bo) |
{ |
#ifdef __TTM__ |
return ttm_bo_is_reserved(&bo->tbo); |
#else |
return !!atomic_read(&bo->tbo.reserved); |
#endif |
} |
|
static inline unsigned radeon_bo_ngpu_pages(struct radeon_bo *bo) |
{ |
return (bo->tbo.num_pages << PAGE_SHIFT) / RADEON_GPU_PAGE_SIZE; |
104,13 → 113,10 |
* @bo: radeon object for which we query the offset |
* |
* Returns mmap offset of the object. |
* |
* Note: addr_space_offset is constant after ttm bo init thus isn't protected |
* by any lock. |
*/ |
static inline u64 radeon_bo_mmap_offset(struct radeon_bo *bo) |
{ |
return bo->tbo.addr_space_offset; |
return drm_vma_node_offset_addr(&bo->tbo.vma_node); |
} |
|
extern int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, |
118,11 → 124,12 |
|
extern int radeon_bo_create(struct radeon_device *rdev, |
unsigned long size, int byte_align, |
bool kernel, u32 domain, |
bool kernel, u32 domain, u32 flags, |
struct sg_table *sg, |
struct radeon_bo **bo_ptr); |
extern int radeon_bo_kmap(struct radeon_bo *bo, void **ptr); |
extern void radeon_bo_kunmap(struct radeon_bo *bo); |
extern struct radeon_bo *radeon_bo_ref(struct radeon_bo *bo); |
extern void radeon_bo_unref(struct radeon_bo **bo); |
extern int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr); |
extern int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, |
132,9 → 139,9 |
extern void radeon_bo_force_delete(struct radeon_device *rdev); |
extern int radeon_bo_init(struct radeon_device *rdev); |
extern void radeon_bo_fini(struct radeon_device *rdev); |
extern void radeon_bo_list_add_object(struct radeon_bo_list *lobj, |
struct list_head *head); |
extern int radeon_bo_list_validate(struct list_head *head, int ring); |
extern int radeon_bo_list_validate(struct radeon_device *rdev, |
struct ww_acquire_ctx *ticket, |
struct list_head *head, int ring); |
extern int radeon_bo_fbdev_mmap(struct radeon_bo *bo, |
struct vm_area_struct *vma); |
extern int radeon_bo_set_tiling_flags(struct radeon_bo *bo, |
144,7 → 151,7 |
extern int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved, |
bool force_drop); |
extern void radeon_bo_move_notify(struct ttm_buffer_object *bo, |
struct ttm_mem_reg *mem); |
struct ttm_mem_reg *new_mem); |
extern int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo); |
extern int radeon_bo_get_surface_reg(struct radeon_bo *bo); |
|
164,7 → 171,8 |
|
extern int radeon_sa_bo_manager_init(struct radeon_device *rdev, |
struct radeon_sa_manager *sa_manager, |
unsigned size, u32 domain); |
unsigned size, u32 align, u32 domain, |
u32 flags); |
extern void radeon_sa_bo_manager_fini(struct radeon_device *rdev, |
struct radeon_sa_manager *sa_manager); |
extern int radeon_sa_bo_manager_start(struct radeon_device *rdev, |
174,7 → 182,7 |
extern int radeon_sa_bo_new(struct radeon_device *rdev, |
struct radeon_sa_manager *sa_manager, |
struct radeon_sa_bo **sa_bo, |
unsigned size, unsigned align, bool block); |
unsigned size, unsigned align); |
extern void radeon_sa_bo_free(struct radeon_device *rdev, |
struct radeon_sa_bo **sa_bo, |
struct radeon_fence *fence); |