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

r600g: Check for other references before checking for existing mappings in radeon_bo_pb_map_internal().

Browse source 
Having a non-NULL data pointer doesn't imply it's safe to reuse that mapping,
it may have been unmapped but not flushed yet.
This commit is contained in:
Henri Verbeet 2010-09-19 19:27:30 +02:00
parent a1d9a58b82
commit b68030e9f8
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/winsys/r600/drm/radeon_bo_pb.c
View file

@ -53,11 +53,16 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
unsigned flags, void *ctx)
{
struct radeon_bo_pb *buf = radeon_bo_pb(_buf);
if (flags & PB_USAGE_DONTBLOCK) {
if (p_atomic_read(&buf->bo->reference.count) > 1)
if (p_atomic_read(&buf->bo->reference.count) > 1) {
if (flags & PB_USAGE_DONTBLOCK) {
return NULL;
}
if (ctx) {
r600_flush_ctx(ctx);
}
}
if (buf->bo->data != NULL) {
LIST_DELINIT(&buf->maplist);
return buf->bo->data;
@ -69,9 +74,6 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
return NULL;
}
if (p_atomic_read(&buf->bo->reference.count) > 1 && ctx) {
r600_flush_ctx(ctx);
}
if (radeon_bo_map(buf->mgr->radeon, buf->bo)) {
return NULL;
}