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

broadcom/vc4: Add pipe_reference debugging for vc4_bos.

Browse source 
Trying to track down the YUV EGLImage use-after-free, it helps to see what
the mystery objects are that are being refcounted.
This commit is contained in:
Eric Anholt 2018-02-20 16:05:29 +00:00
parent 34ea1aca92
commit 6deb158ec1
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/vc4/vc4_bufmgr.c
View file

@ -30,6 +30,7 @@
#include "util/u_hash_table.h"
#include "util/u_memory.h"
#include "util/u_string.h"
#include "util/ralloc.h"
#include "vc4_context.h"
@ -48,6 +49,13 @@ static bool dump_stats = false;
static void
vc4_bo_cache_free_all(struct vc4_bo_cache *cache);
void
vc4_bo_debug_describe(char* buf, const struct vc4_bo *ptr)
{
util_sprintf(buf, "vc4_bo<%s,%u,%u>", ptr->name ? ptr->name : "?",
ptr->handle, ptr->size);
}
void
vc4_bo_label(struct vc4_screen *screen, struct vc4_bo *bo, const char *fmt, ...)
{
@ -389,7 +397,7 @@ vc4_bo_open_handle(struct vc4_screen *screen,
bo = util_hash_table_get(screen->bo_handles, (void*)(uintptr_t)handle);
if (bo) {
pipe_reference(NULL, &bo->reference);
vc4_bo_reference(bo);
goto done;
}

19
src/gallium/drivers/vc4/vc4_bufmgr.h
View file

@ -73,10 +73,13 @@ struct vc4_bo *vc4_bo_open_dmabuf(struct vc4_screen *screen, int fd,
bool vc4_bo_flink(struct vc4_bo *bo, uint32_t *name);
int vc4_bo_get_dmabuf(struct vc4_bo *bo);
void vc4_bo_debug_describe(char* buf, const struct vc4_bo *ptr);
static inline struct vc4_bo *
vc4_bo_reference(struct vc4_bo *bo)
{
pipe_reference(NULL, &bo->reference);
pipe_reference_described(NULL, &bo->reference,
(debug_reference_descriptor)
vc4_bo_debug_describe);
return bo;
}
@ -89,13 +92,18 @@ vc4_bo_unreference(struct vc4_bo **bo)
if ((*bo)->private) {
/* Avoid the mutex for private BOs */
if (pipe_reference(&(*bo)->reference, NULL))
if (pipe_reference_described(&(*bo)->reference, NULL,
(debug_reference_descriptor)
vc4_bo_debug_describe)) {
vc4_bo_last_unreference(*bo);
}
} else {
screen = (*bo)->screen;
mtx_lock(&screen->bo_handles_mutex);
if (pipe_reference(&(*bo)->reference, NULL)) {
if (pipe_reference_described(&(*bo)->reference, NULL,
(debug_reference_descriptor)
vc4_bo_debug_describe)) {
util_hash_table_remove(screen->bo_handles,
(void *)(uintptr_t)(*bo)->handle);
vc4_bo_last_unreference(*bo);
@ -113,8 +121,11 @@ vc4_bo_unreference_locked_timed(struct vc4_bo **bo, time_t time)
if (!*bo)
return;
if (pipe_reference(&(*bo)->reference, NULL))
if (pipe_reference_described(&(*bo)->reference, NULL,
(debug_reference_descriptor)
vc4_bo_debug_describe)) {
vc4_bo_last_unreference_locked_timed(*bo, time);
}
*bo = NULL;
}