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

iris: fix aux buf map failure in 32bits app on Android

Browse source 
Cc: mesa-stable@lists.freedesktop.org
Reported-by: Zhifang Long <zhifang.long@intel.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3784>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3784>
(cherry picked from commit fdd20be324)
This commit is contained in:
Tapani Pälli 2020-02-12 08:45:47 +02:00 • committed by Dylan Baker
parent b81f4a4092
commit c791504c10
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -112,7 +112,7 @@
"description": "iris: fix aux buf map failure in 32bits app on Android",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

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

@ -57,6 +57,7 @@
#include "common/gen_gem.h"
#include "dev/gen_device_info.h"
#include "main/macros.h"
#include "os/os_mman.h"
#include "util/debug.h"
#include "util/macros.h"
#include "util/hash_table.h"
@ -762,15 +763,15 @@ bo_free(struct iris_bo *bo)
if (bo->map_cpu && !bo->userptr) {
VG_NOACCESS(bo->map_cpu, bo->size);
munmap(bo->map_cpu, bo->size);
os_munmap(bo->map_cpu, bo->size);
}
if (bo->map_wc) {
VG_NOACCESS(bo->map_wc, bo->size);
munmap(bo->map_wc, bo->size);
os_munmap(bo->map_wc, bo->size);
}
if (bo->map_gtt) {
VG_NOACCESS(bo->map_gtt, bo->size);
munmap(bo->map_gtt, bo->size);
os_munmap(bo->map_gtt, bo->size);
}
if (bo->idle) {
@ -933,7 +934,7 @@ iris_bo_map_cpu(struct pipe_debug_callback *dbg,
if (p_atomic_cmpxchg(&bo->map_cpu, NULL, map)) {
VG_NOACCESS(map, bo->size);
munmap(map, bo->size);
os_munmap(map, bo->size);
}
}
assert(bo->map_cpu);
@ -995,7 +996,7 @@ iris_bo_map_wc(struct pipe_debug_callback *dbg,
if (p_atomic_cmpxchg(&bo->map_wc, NULL, map)) {
VG_NOACCESS(map, bo->size);
munmap(map, bo->size);
os_munmap(map, bo->size);
}
}
assert(bo->map_wc);
@ -1053,8 +1054,8 @@ iris_bo_map_gtt(struct pipe_debug_callback *dbg,
}
/* and mmap it. */
void *map = mmap(0, bo->size, PROT_READ | PROT_WRITE,
MAP_SHARED, bufmgr->fd, mmap_arg.offset);
void *map = os_mmap(0, bo->size, PROT_READ | PROT_WRITE,
MAP_SHARED, bufmgr->fd, mmap_arg.offset);
if (map == MAP_FAILED) {
DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
__FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
@ -1070,7 +1071,7 @@ iris_bo_map_gtt(struct pipe_debug_callback *dbg,
if (p_atomic_cmpxchg(&bo->map_gtt, NULL, map)) {
VG_NOACCESS(map, bo->size);
munmap(map, bo->size);
os_munmap(map, bo->size);
}
}
assert(bo->map_gtt);