mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
97a875cbdf
All items on the lru list are always reservable, so this is a stupid thing to keep. Not only that, it is used in a way which would guarantee deadlocks if it were ever to be set to block on reserve. This is a lot of churn, but mostly because of the removal of the argument which can be nested arbitrarily deeply in many places. No change of code in this patch except removal of the no_wait_reserve argument, the previous patch removed the use of no_wait_reserve. v2: - Warn if -EBUSY is returned on reservation, all objects on the list should be reservable. Adjusted patch slightly due to conflicts. v3: - Focus on no_wait_reserve removal only. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
99 lines
2.6 KiB
C
99 lines
2.6 KiB
C
#ifndef __NOUVEAU_BO_H__
|
|
#define __NOUVEAU_BO_H__
|
|
|
|
struct nouveau_channel;
|
|
struct nouveau_fence;
|
|
struct nouveau_vma;
|
|
|
|
struct nouveau_bo {
|
|
struct ttm_buffer_object bo;
|
|
struct ttm_placement placement;
|
|
u32 valid_domains;
|
|
u32 placements[3];
|
|
u32 busy_placements[3];
|
|
struct ttm_bo_kmap_obj kmap;
|
|
struct list_head head;
|
|
|
|
/* protected by ttm_bo_reserve() */
|
|
struct drm_file *reserved_by;
|
|
struct list_head entry;
|
|
int pbbo_index;
|
|
bool validate_mapped;
|
|
|
|
struct list_head vma_list;
|
|
unsigned page_shift;
|
|
|
|
u32 tile_mode;
|
|
u32 tile_flags;
|
|
struct nouveau_drm_tile *tile;
|
|
|
|
struct drm_gem_object *gem;
|
|
int pin_refcnt;
|
|
|
|
struct ttm_bo_kmap_obj dma_buf_vmap;
|
|
int vmapping_count;
|
|
};
|
|
|
|
static inline struct nouveau_bo *
|
|
nouveau_bo(struct ttm_buffer_object *bo)
|
|
{
|
|
return container_of(bo, struct nouveau_bo, bo);
|
|
}
|
|
|
|
static inline int
|
|
nouveau_bo_ref(struct nouveau_bo *ref, struct nouveau_bo **pnvbo)
|
|
{
|
|
struct nouveau_bo *prev;
|
|
|
|
if (!pnvbo)
|
|
return -EINVAL;
|
|
prev = *pnvbo;
|
|
|
|
*pnvbo = ref ? nouveau_bo(ttm_bo_reference(&ref->bo)) : NULL;
|
|
if (prev) {
|
|
struct ttm_buffer_object *bo = &prev->bo;
|
|
|
|
ttm_bo_unref(&bo);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
extern struct ttm_bo_driver nouveau_bo_driver;
|
|
|
|
void nouveau_bo_move_init(struct nouveau_drm *);
|
|
int nouveau_bo_new(struct drm_device *, int size, int align, u32 flags,
|
|
u32 tile_mode, u32 tile_flags, struct sg_table *sg,
|
|
struct nouveau_bo **);
|
|
int nouveau_bo_pin(struct nouveau_bo *, u32 flags);
|
|
int nouveau_bo_unpin(struct nouveau_bo *);
|
|
int nouveau_bo_map(struct nouveau_bo *);
|
|
void nouveau_bo_unmap(struct nouveau_bo *);
|
|
void nouveau_bo_placement_set(struct nouveau_bo *, u32 type, u32 busy);
|
|
u16 nouveau_bo_rd16(struct nouveau_bo *, unsigned index);
|
|
void nouveau_bo_wr16(struct nouveau_bo *, unsigned index, u16 val);
|
|
u32 nouveau_bo_rd32(struct nouveau_bo *, unsigned index);
|
|
void nouveau_bo_wr32(struct nouveau_bo *, unsigned index, u32 val);
|
|
void nouveau_bo_fence(struct nouveau_bo *, struct nouveau_fence *);
|
|
int nouveau_bo_validate(struct nouveau_bo *, bool interruptible,
|
|
bool no_wait_gpu);
|
|
|
|
struct nouveau_vma *
|
|
nouveau_bo_vma_find(struct nouveau_bo *, struct nouveau_vm *);
|
|
|
|
int nouveau_bo_vma_add(struct nouveau_bo *, struct nouveau_vm *,
|
|
struct nouveau_vma *);
|
|
void nouveau_bo_vma_del(struct nouveau_bo *, struct nouveau_vma *);
|
|
|
|
/* TODO: submit equivalent to TTM generic API upstream? */
|
|
static inline void __iomem *
|
|
nvbo_kmap_obj_iovirtual(struct nouveau_bo *nvbo)
|
|
{
|
|
bool is_iomem;
|
|
void __iomem *ioptr = (void __force __iomem *)ttm_kmap_obj_virtual(
|
|
&nvbo->kmap, &is_iomem);
|
|
WARN_ON_ONCE(ioptr && !is_iomem);
|
|
return ioptr;
|
|
}
|
|
|
|
#endif
|