AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: clean up mmap-diagnostics

Browse Source 
Do not double-print the failure. While we're at it, make sure the
diagnostic includes plenty of details for easier debugging.

Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32428>
This commit is contained in:
Erik Faye-Lund
2024-11-29 15:34:47 +01:00
committed by Marge Bot
parent 3006c2a7b6
commit d5f4f918f3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_bo.c
+1 -4
View File
@@ -341,11 +341,8 @@ panfrost_bo_mmap(struct panfrost_bo *bo)
bo->ptr.cpu = pan_kmod_bo_mmap(bo->kmod_bo, 0, panfrost_bo_size(bo), bo->ptr.cpu = pan_kmod_bo_mmap(bo->kmod_bo, 0, panfrost_bo_size(bo),
PROT_READ | PROT_WRITE, MAP_SHARED, NULL); PROT_READ | PROT_WRITE, MAP_SHARED, NULL);
if (bo->ptr.cpu == MAP_FAILED) { if (bo->ptr.cpu == MAP_FAILED)
bo->ptr.cpu = NULL; bo->ptr.cpu = NULL;
mesa_loge("mmap failed: result=%p size=0x%llx\n", bo->ptr.cpu,
(long long)panfrost_bo_size(bo));
}
} }
static void static void
src/panfrost/lib/kmod/pan_kmod.h
+5 -2
View File
@@ -617,8 +617,11 @@ pan_kmod_bo_mmap(struct pan_kmod_bo *bo, off_t bo_offset, size_t size, int prot,
host_addr = os_mmap(host_addr, size, prot, flags, bo->dev->fd, host_addr = os_mmap(host_addr, size, prot, flags, bo->dev->fd,
mmap_offset + bo_offset); mmap_offset + bo_offset);
if (host_addr == MAP_FAILED) if (host_addr == MAP_FAILED) {
mesa_loge("mmap() failed (err=%d)", errno); mesa_loge("mmap(..., size=%zu, prot=%d, flags=0x%x) failed: %s",
size, prot, flags, strerror(errno));
return NULL;
}
return host_addr; return host_addr;
} }