From b5fcf0c8e07e666523b007fab1d0fc18c2c89241 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 28 Aug 2010 18:59:32 +1000 Subject: pb: add void * for flush ctx to mapping functions If the buffer we are attempting to map is referenced by the unsubmitted command stream for this context, we need to flush the command stream, however to do that we need to be able to access the context at the lowest level map function, currently we set the buffer in the toplevel map, but this racy between context. (we probably have a lot more issues than that.) I'll look into a proper solution as suggested by jrfonseca when I get some time. --- src/gallium/winsys/radeon/drm/radeon_drm_buffer.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/gallium/winsys/radeon/drm') diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c index 017eac8464..cef59975ca 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c @@ -89,10 +89,10 @@ static unsigned get_pb_usage_from_transfer_flags(enum pipe_transfer_usage usage) static void * radeon_drm_buffer_map_internal(struct pb_buffer *_buf, - unsigned flags) + unsigned flags, void *flush_ctx) { struct radeon_drm_buffer *buf = radeon_drm_buffer(_buf); - struct radeon_libdrm_cs *cs = buf->cs; + struct radeon_libdrm_cs *cs = flush_ctx; int write = 0; if (flags & PB_USAGE_DONTBLOCK) { @@ -293,12 +293,8 @@ void *radeon_drm_buffer_map(struct r300_winsys_screen *ws, enum pipe_transfer_usage usage) { struct pb_buffer *_buf = radeon_pb_buffer(buf); - struct radeon_drm_buffer *rbuf = get_drm_buffer(_buf); - if (rbuf) - rbuf->cs = radeon_libdrm_cs(cs); - - return pb_map(_buf, get_pb_usage_from_transfer_flags(usage)); + return pb_map(_buf, get_pb_usage_from_transfer_flags(usage), radeon_libdrm_cs(cs)); } void radeon_drm_buffer_unmap(struct r300_winsys_screen *ws, -- cgit v1.2.3