fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600g: fix tiling with cayman and virtual memory

Browse source 
The virtual address but follow the alignment requirement of the
tiled surface. The bo from handle case is not properly fix. Need
bigger change for a proper fix. Work around that by enforcing 1M
alignment for those bo.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
Jerome Glisse 2012-02-14 16:26:12 -05:00
parent 6b0a07f9ce
commit 356eb0aadb
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gallium/winsys/radeon/drm/radeon_drm_bo.c
View file

@ -196,32 +196,50 @@ static boolean radeon_bo_is_busy(struct pb_buffer *_buf,
}
}
static uint64_t radeon_bomgr_find_va(struct radeon_bomgr *mgr, uint64_t size)
static uint64_t radeon_bomgr_find_va(struct radeon_bomgr *mgr, uint64_t size, uint64_t alignment)
{
struct radeon_bo_va_hole *hole, *n;
uint64_t offset = 0;
uint64_t offset = 0, waste = 0;
pipe_mutex_lock(mgr->bo_va_mutex);
/* first look for a hole */
LIST_FOR_EACH_ENTRY_SAFE(hole, n, &mgr->va_holes, list) {
if (hole->size == size) {
offset = hole->offset;
waste = 0;
if (alignment) {
waste = offset % alignment;
waste = waste ? alignment - waste : 0;
}
offset += waste;
if (!waste && hole->size == size) {
offset = hole->offset;
list_del(&hole->list);
FREE(hole);
pipe_mutex_unlock(mgr->bo_va_mutex);
return offset;
}
if (hole->size > size) {
offset = hole->offset;
hole->size -= size;
hole->offset += size;
if ((hole->size - waste) >= size) {
if (waste) {
n = CALLOC_STRUCT(radeon_bo_va_hole);
n->size = waste;
n->offset = hole->offset;
list_add(&n->list, &mgr->va_holes);
}
hole->size -= (size + waste);
hole->offset += size + waste;
pipe_mutex_unlock(mgr->bo_va_mutex);
return offset;
}
}
offset = mgr->va_offset;
mgr->va_offset += size;
waste = 0;
if (alignment) {
waste = offset % alignment;
waste = waste ? alignment - waste : 0;
}
offset += waste;
mgr->va_offset += size + waste;
pipe_mutex_unlock(mgr->bo_va_mutex);
return offset;
}
@ -517,7 +535,7 @@ static struct pb_buffer *radeon_bomgr_create_bo(struct pb_manager *_mgr,
struct drm_radeon_gem_va va;
bo->va_size = align(size, 4096);
bo->va = radeon_bomgr_find_va(mgr, bo->va_size);
bo->va = radeon_bomgr_find_va(mgr, bo->va_size, desc->alignment);
va.handle = bo->handle;
va.vm_id = 0;
@ -818,7 +836,7 @@ done:
struct drm_radeon_gem_va va;
bo->va_size = ((bo->base.size + 4095) & ~4095);
bo->va = radeon_bomgr_find_va(mgr, bo->va_size);
bo->va = radeon_bomgr_find_va(mgr, bo->va_size, 1 << 20);
va.handle = bo->handle;
va.operation = RADEON_VA_MAP;