diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 31 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 8 |
2 files changed, 31 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 09755e04b58..6592c5bdeca 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -209,11 +209,15 @@ static void r600_buffer_destroy(struct pipe_screen *screen, FREE(rbuffer); } -void r600_invalidate_resource(struct pipe_context *ctx, - struct pipe_resource *resource) +static bool +r600_do_invalidate_resource(struct r600_common_context *rctx, + struct r600_resource *rbuffer) { - struct r600_common_context *rctx = (struct r600_common_context*)ctx; - struct r600_resource *rbuffer = r600_resource(resource); + /* In AMD_pinned_memory, the user pointer association only gets + * broken when the buffer is explicitly re-allocated. + */ + if (rctx->ws->buffer_is_user_ptr(rbuffer->buf)) + return false; /* Check if mapping this buffer would cause waiting for the GPU. */ if (r600_rings_is_buffer_referenced(rctx, rbuffer->buf, RADEON_USAGE_READWRITE) || @@ -222,6 +226,17 @@ void r600_invalidate_resource(struct pipe_context *ctx, } else { util_range_set_empty(&rbuffer->valid_buffer_range); } + + return true; +} + +void r600_invalidate_resource(struct pipe_context *ctx, + struct pipe_resource *resource) +{ + struct r600_common_context *rctx = (struct r600_common_context*)ctx; + struct r600_resource *rbuffer = r600_resource(resource); + + (void)r600_do_invalidate_resource(rctx, rbuffer); } static void *r600_buffer_get_transfer(struct pipe_context *ctx, @@ -291,10 +306,10 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) { assert(usage & PIPE_TRANSFER_WRITE); - r600_invalidate_resource(ctx, resource); - - /* At this point, the buffer is always idle. */ - usage |= PIPE_TRANSFER_UNSYNCHRONIZED; + if (r600_do_invalidate_resource(rctx, rbuffer)) { + /* At this point, the buffer is always idle. */ + usage |= PIPE_TRANSFER_UNSYNCHRONIZED; + } } else if ((usage & PIPE_TRANSFER_DISCARD_RANGE) && !(usage & PIPE_TRANSFER_UNSYNCHRONIZED) && diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 4af6a1877bf..ad304747eab 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -530,6 +530,14 @@ struct radeon_winsys { void *pointer, unsigned size); /** + * Whether the buffer was created from a user pointer. + * + * \param buf A winsys buffer object + * \return whether \p buf was created via buffer_from_ptr + */ + bool (*buffer_is_user_ptr)(struct pb_buffer *buf); + + /** * Get a winsys handle from a winsys buffer. The internal structure * of the handle is platform-specific and only a winsys should access it. * |