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

iris/bufmgr: Add and use zero_bo

Browse source 
This simplifies the next patch.

Cc: mesa-stable
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22487>
(cherry picked from commit 215fbbb604)
This commit is contained in:
Nanley Chery 2023-04-10 14:18:56 -07:00 • committed by Eric Engestrom
parent 612e6e6038
commit 808a95d24a
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -499,7 +499,7 @@
"description": "iris/bufmgr: Add and use zero_bo",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

37
src/gallium/drivers/iris/iris_bufmgr.c
View file

@ -787,6 +787,21 @@ flags_to_heap(struct iris_bufmgr *bufmgr, unsigned flags)
}
}
static bool
zero_bo(struct iris_bufmgr *bufmgr,
unsigned flags,
struct iris_bo *bo)
{
assert(flags & BO_ALLOC_ZEROED);
void *map = iris_bo_map(NULL, bo, MAP_WRITE | MAP_RAW);
if (!map)
return false;
memset(map, 0, bo->size);
return true;
}
static struct iris_bo *
alloc_bo_from_slabs(struct iris_bufmgr *bufmgr,
const char *name,
@ -863,14 +878,9 @@ alloc_bo_from_slabs(struct iris_bufmgr *bufmgr,
/* Zero the contents if necessary. If this fails, fall back to
* allocating a fresh BO, which will always be zeroed by the kernel.
*/
if (flags & BO_ALLOC_ZEROED) {
void *map = iris_bo_map(NULL, bo, MAP_WRITE | MAP_RAW);
if (map) {
memset(map, 0, bo->size);
} else {
pb_slab_free(slabs, &bo->slab.entry);
return NULL;
}
if ((flags & BO_ALLOC_ZEROED) && !zero_bo(bufmgr, flags, bo)) {
pb_slab_free(slabs, &bo->slab.entry);
return NULL;
}
return bo;
@ -960,14 +970,9 @@ alloc_bo_from_cache(struct iris_bufmgr *bufmgr,
/* Zero the contents if necessary. If this fails, fall back to
* allocating a fresh BO, which will always be zeroed by the kernel.
*/
if (flags & BO_ALLOC_ZEROED) {
void *map = iris_bo_map(NULL, bo, MAP_WRITE | MAP_RAW);
if (map) {
memset(map, 0, bo->size);
} else {
bo_free(bo);
return NULL;
}
if ((flags & BO_ALLOC_ZEROED) && !zero_bo(bufmgr, flags, bo)) {
bo_free(bo);
return NULL;
}
return bo;