fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 20:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

panfrost: Allocate dedicated slab for linear BOs

Browse source 
Previously, linear BOs shared memory with each other to minimize kernel
round-trips / latency, as well as to work around a bug in the free_slab
function. These concerns are invalid now, but continuing to use the slab
allocator for BOs resulted in memory allocation errors. This issue was
aggravated, though not introduced (so not a real regression) in the
previous commit.

v2 (unreviewed): Fix bug in v1 preventing munmaps from working

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-03-08 23:36:02 +00:00
parent f9dc1ebc0d
commit 9f25a4e65c
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -223,17 +223,20 @@ panfrost_create_bo(struct panfrost_screen *screen, const struct pipe_resource *t
for (int l = 0; l < (template->last_level + 1); ++l) {
bo->cpu[l] = malloc(sz);
bo->size[l] = sz;
sz >>= 2;
}
} else {
/* But for linear, we can! */
/* For a linear resource, allocate a block of memory from
* kernel space */
struct pb_slab_entry *entry = pb_slab_alloc(&screen->slabs, sz, HEAP_TEXTURE);
struct panfrost_memory_entry *p_entry = (struct panfrost_memory_entry *) entry;
struct panfrost_memory *backing = (struct panfrost_memory *) entry->slab;
bo->entry[0] = p_entry;
bo->cpu[0] = backing->cpu + p_entry->offset;
bo->gpu[0] = backing->gpu + p_entry->offset;
struct panfrost_memory mem;
bo->size[0] = ALIGN(sz, 4096);
screen->driver->allocate_slab(screen, &mem, bo->size[0] / 4096, true, 0, 0, 0);
bo->cpu[0] = mem.cpu;
bo->gpu[0] = mem.gpu;
/* TODO: Mipmap */
}
@ -303,12 +306,16 @@ panfrost_destroy_bo(struct panfrost_screen *screen, struct panfrost_bo *pbo)
{
struct panfrost_bo *bo = (struct panfrost_bo *)pbo;
for (int l = 0; l < MAX_MIP_LEVELS; ++l) {
if (bo->entry[l] != NULL) {
/* Most allocations have an entry to free */
bo->entry[l]->freed = true;
pb_slab_free(&screen->slabs, &bo->entry[l]->base);
}
if (bo->layout == PAN_LINEAR && !bo->imported) {
/* Construct a memory object for all mip levels */
struct panfrost_memory mem = {
.cpu = bo->cpu[0],
.gpu = bo->gpu[0],
.size = bo->size[0]
};
screen->driver->free_slab(screen, &mem);
}
if (bo->layout == PAN_TILED) {

4
src/gallium/drivers/panfrost/pan_resource.h
View file

@ -56,8 +56,8 @@ struct panfrost_bo {
/* Set if this bo was imported rather than allocated */
bool imported;
/* Number of bytes of the imported allocation */
size_t imported_size;
/* Number of bytes of allocation */
size_t size[MAX_MIP_LEVELS];
/* Internal layout (tiled?) */
enum panfrost_memory_layout layout;