mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-23 06:05:15 +07:00
9ca7f7968b
Commit019cbd4a4f("drm/nouveau: Initialize GEM object before TTM object") introduced a subtle change in how the buffer allocation size is handled. Prior to that change, the size would get aligned to at least a page, whereas after that change a non-page-aligned size would get passed through unmodified. This ultimately causes a BUG_ON() to trigger in drm_gem_private_object_init() and crashes the system. Fix this by restoring the code that align the allocation size. Fixes:019cbd4a4f("drm/nouveau: Initialize GEM object before TTM object") Reported-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
136 lines
3.4 KiB
C
136 lines
3.4 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NOUVEAU_BO_H__
|
|
#define __NOUVEAU_BO_H__
|
|
|
|
#include <drm/drm_gem.h>
|
|
|
|
struct nouveau_channel;
|
|
struct nouveau_fence;
|
|
struct nvkm_vma;
|
|
|
|
struct nouveau_bo {
|
|
struct ttm_buffer_object bo;
|
|
struct ttm_placement placement;
|
|
u32 valid_domains;
|
|
struct ttm_place placements[3];
|
|
struct ttm_place busy_placements[3];
|
|
bool force_coherent;
|
|
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 contig:1;
|
|
unsigned page:5;
|
|
unsigned kind:8;
|
|
unsigned comp:3;
|
|
unsigned zeta:3;
|
|
unsigned mode;
|
|
|
|
struct nouveau_drm_tile *tile;
|
|
|
|
/* protect by the ttm reservation lock */
|
|
int pin_refcnt;
|
|
|
|
struct ttm_bo_kmap_obj dma_buf_vmap;
|
|
};
|
|
|
|
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;
|
|
|
|
if (ref) {
|
|
ttm_bo_get(&ref->bo);
|
|
*pnvbo = nouveau_bo(&ref->bo);
|
|
} else {
|
|
*pnvbo = NULL;
|
|
}
|
|
if (prev)
|
|
ttm_bo_put(&prev->bo);
|
|
|
|
return 0;
|
|
}
|
|
|
|
extern struct ttm_bo_driver nouveau_bo_driver;
|
|
|
|
void nouveau_bo_move_init(struct nouveau_drm *);
|
|
struct nouveau_bo *nouveau_bo_alloc(struct nouveau_cli *, u64 *size, int *align,
|
|
u32 flags, u32 tile_mode, u32 tile_flags);
|
|
int nouveau_bo_init(struct nouveau_bo *, u64 size, int align, u32 flags,
|
|
struct sg_table *sg, struct dma_resv *robj);
|
|
int nouveau_bo_new(struct nouveau_cli *, u64 size, int align, u32 flags,
|
|
u32 tile_mode, u32 tile_flags, struct sg_table *sg,
|
|
struct dma_resv *robj,
|
|
struct nouveau_bo **);
|
|
int nouveau_bo_pin(struct nouveau_bo *, u32 flags, bool contig);
|
|
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);
|
|
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 *, bool exclusive);
|
|
int nouveau_bo_validate(struct nouveau_bo *, bool interruptible,
|
|
bool no_wait_gpu);
|
|
void nouveau_bo_sync_for_device(struct nouveau_bo *nvbo);
|
|
void nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo);
|
|
|
|
/* 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;
|
|
}
|
|
|
|
static inline void
|
|
nouveau_bo_unmap_unpin_unref(struct nouveau_bo **pnvbo)
|
|
{
|
|
if (*pnvbo) {
|
|
nouveau_bo_unmap(*pnvbo);
|
|
nouveau_bo_unpin(*pnvbo);
|
|
nouveau_bo_ref(NULL, pnvbo);
|
|
}
|
|
}
|
|
|
|
static inline int
|
|
nouveau_bo_new_pin_map(struct nouveau_cli *cli, u64 size, int align, u32 flags,
|
|
struct nouveau_bo **pnvbo)
|
|
{
|
|
int ret = nouveau_bo_new(cli, size, align, flags,
|
|
0, 0, NULL, NULL, pnvbo);
|
|
if (ret == 0) {
|
|
ret = nouveau_bo_pin(*pnvbo, flags, true);
|
|
if (ret == 0) {
|
|
ret = nouveau_bo_map(*pnvbo);
|
|
if (ret == 0)
|
|
return ret;
|
|
nouveau_bo_unpin(*pnvbo);
|
|
}
|
|
nouveau_bo_ref(NULL, pnvbo);
|
|
}
|
|
return ret;
|
|
}
|
|
#endif
|