[Mesa-dev] [PATCH 52/53] i965/drm: Reindent intel_bufmgr_gem.c and brw_bufmgr.h.
Kenneth Graunke
kenneth at whitecape.org
Wed Apr 5 00:10:42 UTC 2017
indent -i3 -nut -br -brs -npcs -ce --no-tabs -Tuint32_t -Tuint64_t
plus some manual fixes because those aren't quite the right settings.
---
src/mesa/drivers/dri/i965/brw_bufmgr.h | 196 +--
src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 2152 +++++++++++++-------------
2 files changed, 1147 insertions(+), 1201 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index c05b67dda7f..974f7d9e20c 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -46,88 +46,88 @@ extern "C" {
struct gen_device_info;
struct brw_bo {
- /**
- * Size in bytes of the buffer object.
- *
- * The size may be larger than the size originally requested for the
- * allocation, such as being aligned to page size.
- */
- unsigned long size;
-
- /**
- * Alignment requirement for object
- *
- * Used for GTT mapping & pinning the object.
- */
- unsigned long align;
-
- /**
- * Virtual address for accessing the buffer data. Only valid while
- * mapped.
- */
+ /**
+ * Size in bytes of the buffer object.
+ *
+ * The size may be larger than the size originally requested for the
+ * allocation, such as being aligned to page size.
+ */
+ unsigned long size;
+
+ /**
+ * Alignment requirement for object
+ *
+ * Used for GTT mapping & pinning the object.
+ */
+ unsigned long align;
+
+ /**
+ * Virtual address for accessing the buffer data. Only valid while
+ * mapped.
+ */
#ifdef __cplusplus
- void *virt;
+ void *virt;
#else
- void *virtual;
+ void *virtual;
#endif
- /** Buffer manager context associated with this buffer object */
- struct brw_bufmgr *bufmgr;
-
- /** The GEM handle for this buffer object. */
- uint32_t gem_handle;
-
- /**
- * Last seen card virtual address (offset from the beginning of the
- * aperture) for the object. This should be used to fill relocation
- * entries when calling brw_bo_emit_reloc()
- */
- uint64_t offset64;
-
- /**
- * Boolean of whether the GPU is definitely not accessing the buffer.
- *
- * This is only valid when reusable, since non-reusable
- * buffers are those that have been shared with other
- * processes, so we don't know their state.
- */
- bool idle;
-
- int refcount;
- const char *name;
-
- /**
- * Kenel-assigned global name for this object
- *
- * List contains both flink named and prime fd'd objects
- */
- unsigned int global_name;
-
- /**
- * Current tiling mode
- */
- uint32_t tiling_mode;
- uint32_t swizzle_mode;
- unsigned long stride;
-
- time_t free_time;
-
- /** Mapped address for the buffer, saved across map/unmap cycles */
- void *mem_virtual;
- /** GTT virtual address for the buffer, saved across map/unmap cycles */
- void *gtt_virtual;
- /** WC CPU address for the buffer, saved across map/unmap cycles */
- void *wc_virtual;
- int map_count;
- struct list_head vma_list;
-
- /** BO cache list */
- struct list_head head;
-
- /**
- * Boolean of whether this buffer can be re-used
- */
- bool reusable;
+ /** Buffer manager context associated with this buffer object */
+ struct brw_bufmgr *bufmgr;
+
+ /** The GEM handle for this buffer object. */
+ uint32_t gem_handle;
+
+ /**
+ * Last seen card virtual address (offset from the beginning of the
+ * aperture) for the object. This should be used to fill relocation
+ * entries when calling brw_bo_emit_reloc()
+ */
+ uint64_t offset64;
+
+ /**
+ * Boolean of whether the GPU is definitely not accessing the buffer.
+ *
+ * This is only valid when reusable, since non-reusable
+ * buffers are those that have been shared with other
+ * processes, so we don't know their state.
+ */
+ bool idle;
+
+ int refcount;
+ const char *name;
+
+ /**
+ * Kenel-assigned global name for this object
+ *
+ * List contains both flink named and prime fd'd objects
+ */
+ unsigned int global_name;
+
+ /**
+ * Current tiling mode
+ */
+ uint32_t tiling_mode;
+ uint32_t swizzle_mode;
+ unsigned long stride;
+
+ time_t free_time;
+
+ /** Mapped address for the buffer, saved across map/unmap cycles */
+ void *mem_virtual;
+ /** GTT virtual address for the buffer, saved across map/unmap cycles */
+ void *gtt_virtual;
+ /** WC CPU address for the buffer, saved across map/unmap cycles */
+ void *wc_virtual;
+ int map_count;
+ struct list_head vma_list;
+
+ /** BO cache list */
+ struct list_head head;
+
+ /**
+ * Boolean of whether this buffer can be re-used
+ */
+ bool reusable;
};
#define BO_ALLOC_FOR_RENDER (1<<0)
@@ -140,7 +140,7 @@ struct brw_bo {
* using bo_map() or brw_bo_map_gtt() to be used by the CPU.
*/
struct brw_bo *brw_bo_alloc(struct brw_bufmgr *bufmgr, const char *name,
- unsigned long size, unsigned int alignment);
+ unsigned long size, unsigned int alignment);
/**
* Allocate a buffer object, hinting that it will be used as a
* render target.
@@ -148,9 +148,9 @@ struct brw_bo *brw_bo_alloc(struct brw_bufmgr *bufmgr, const char *name,
* This is otherwise the same as bo_alloc.
*/
struct brw_bo *brw_bo_alloc_for_render(struct brw_bufmgr *bufmgr,
- const char *name,
- unsigned long size,
- unsigned int alignment);
+ const char *name,
+ unsigned long size,
+ unsigned int alignment);
/**
* Allocate a tiled buffer object.
@@ -168,11 +168,11 @@ struct brw_bo *brw_bo_alloc_for_render(struct brw_bufmgr *bufmgr,
* may have been rounded up to accommodate for tiling restrictions.
*/
struct brw_bo *brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr,
- const char *name,
- int x, int y, int cpp,
- uint32_t *tiling_mode,
- unsigned long *pitch,
- unsigned long flags);
+ const char *name,
+ int x, int y, int cpp,
+ uint32_t *tiling_mode,
+ unsigned long *pitch,
+ unsigned long flags);
/** Takes a reference on a buffer object */
void brw_bo_reference(struct brw_bo *bo);
@@ -200,10 +200,10 @@ int brw_bo_unmap(struct brw_bo *bo);
/** Write data into an object. */
int brw_bo_subdata(struct brw_bo *bo, unsigned long offset,
- unsigned long size, const void *data);
+ unsigned long size, const void *data);
/** Read data from an object. */
int brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
- unsigned long size, void *data);
+ unsigned long size, void *data);
/**
* Waits for rendering to an object by the GPU to have completed.
*
@@ -224,8 +224,8 @@ void brw_bufmgr_destroy(struct brw_bufmgr *bufmgr);
* \param buf Buffer to set tiling mode for
* \param tiling_mode desired, and returned tiling mode
*/
-int brw_bo_set_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
- uint32_t stride);
+int brw_bo_set_tiling(struct brw_bo *bo, uint32_t *tiling_mode,
+ uint32_t stride);
/**
* Get the current tiling (and resulting swizzling) mode for the bo.
*
@@ -233,8 +233,8 @@ int brw_bo_set_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
* \param tiling_mode returned tiling mode
* \param swizzle_mode returned swizzling mode
*/
-int brw_bo_get_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
- uint32_t * swizzle_mode);
+int brw_bo_get_tiling(struct brw_bo *bo, uint32_t *tiling_mode,
+ uint32_t *swizzle_mode);
/**
* Create a visible name for a buffer which can be used by other apps
@@ -242,7 +242,7 @@ int brw_bo_get_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
* \param buf Buffer to create a name for
* \param name Returned name
*/
-int brw_bo_flink(struct brw_bo *bo, uint32_t * name);
+int brw_bo_flink(struct brw_bo *bo, uint32_t *name);
/**
* Returns 1 if mapping the buffer for write could cause the process
@@ -288,7 +288,7 @@ struct brw_bo *brw_bo_gem_create_from_name(struct brw_bufmgr *bufmgr,
unsigned int handle);
void brw_bufmgr_enable_reuse(struct brw_bufmgr *bufmgr);
void brw_bufmgr_gem_set_vma_cache_size(struct brw_bufmgr *bufmgr,
- int limit);
+ int limit);
int brw_bo_map_unsynchronized(struct brw_bo *bo);
int brw_bo_map_gtt(struct brw_bo *bo);
@@ -305,14 +305,14 @@ void brw_destroy_hw_context(struct brw_bufmgr *bufmgr, uint32_t ctx_id);
int brw_bo_gem_export_to_prime(struct brw_bo *bo, int *prime_fd);
struct brw_bo *brw_bo_gem_create_from_prime(struct brw_bufmgr *bufmgr,
- int prime_fd, int size);
+ int prime_fd, int size);
-int brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset, uint64_t *result);
+int brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset,
+ uint64_t *result);
/** @{ */
#if defined(__cplusplus)
}
#endif
-
#endif /* INTEL_BUFMGR_H */
diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
index e93499a858c..38d5fbecf1e 100644
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
@@ -30,8 +30,8 @@
/*
* Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
* Keith Whitwell <keithw-at-tungstengraphics-dot-com>
- * Eric Anholt <eric at anholt.net>
- * Dave Airlie <airlied at linux.ie>
+ * Eric Anholt <eric at anholt.net>
+ * Dave Airlie <airlied at linux.ie>
*/
#ifdef HAVE_CONFIG_H
@@ -91,63 +91,63 @@ atomic_add_unless(int *v, int add, int unless)
}
struct bo_cache_bucket {
- struct list_head head;
- unsigned long size;
+ struct list_head head;
+ unsigned long size;
};
struct brw_bufmgr {
- int fd;
+ int fd;
- pthread_mutex_t lock;
+ pthread_mutex_t lock;
- /** Array of lists of cached gem objects of power-of-two sizes */
- struct bo_cache_bucket cache_bucket[14 * 4];
- int num_buckets;
- time_t time;
+ /** Array of lists of cached gem objects of power-of-two sizes */
+ struct bo_cache_bucket cache_bucket[14 * 4];
+ int num_buckets;
+ time_t time;
- struct hash_table *name_table;
- struct hash_table *handle_table;
+ struct hash_table *name_table;
+ struct hash_table *handle_table;
- struct list_head vma_cache;
- int vma_count, vma_open, vma_max;
+ struct list_head vma_cache;
+ int vma_count, vma_open, vma_max;
- unsigned int has_llc : 1;
- unsigned int bo_reuse : 1;
+ unsigned int has_llc:1;
+ unsigned int bo_reuse:1;
};
-static int
-bo_set_tiling_internal(struct brw_bo *bo, uint32_t tiling_mode, uint32_t stride);
+static int bo_set_tiling_internal(struct brw_bo *bo, uint32_t tiling_mode,
+ uint32_t stride);
static void bo_free(struct brw_bo *bo);
static uint32_t
key_hash_uint(const void *key)
{
- return _mesa_hash_data(key, 4);
+ return _mesa_hash_data(key, 4);
}
static bool
key_uint_equal(const void *a, const void *b)
{
- return *((unsigned *) a) == *((unsigned *) b);
+ return *((unsigned *) a) == *((unsigned *) b);
}
static struct brw_bo *
hash_find_bo(struct hash_table *ht, unsigned int key)
{
- struct hash_entry *entry = _mesa_hash_table_search(ht, &key);
- return entry ? (struct brw_bo *) entry->data : NULL;
+ struct hash_entry *entry = _mesa_hash_table_search(ht, &key);
+ return entry ? (struct brw_bo *) entry->data : NULL;
}
static unsigned long
bo_tile_size(struct brw_bufmgr *bufmgr, unsigned long size,
- uint32_t *tiling_mode)
+ uint32_t *tiling_mode)
{
- if (*tiling_mode == I915_TILING_NONE)
- return size;
+ if (*tiling_mode == I915_TILING_NONE)
+ return size;
- /* 965+ just need multiples of page size for tiling */
- return ALIGN(size, 4096);
+ /* 965+ just need multiples of page size for tiling */
+ return ALIGN(size, 4096);
}
/*
@@ -157,297 +157,287 @@ bo_tile_size(struct brw_bufmgr *bufmgr, unsigned long size,
*/
static unsigned long
bo_tile_pitch(struct brw_bufmgr *bufmgr,
- unsigned long pitch, uint32_t *tiling_mode)
+ unsigned long pitch, uint32_t *tiling_mode)
{
- unsigned long tile_width;
+ unsigned long tile_width;
- /* If untiled, then just align it so that we can do rendering
- * to it with the 3D engine.
- */
- if (*tiling_mode == I915_TILING_NONE)
- return ALIGN(pitch, 64);
+ /* If untiled, then just align it so that we can do rendering
+ * to it with the 3D engine.
+ */
+ if (*tiling_mode == I915_TILING_NONE)
+ return ALIGN(pitch, 64);
- if (*tiling_mode == I915_TILING_X)
- tile_width = 512;
- else
- tile_width = 128;
+ if (*tiling_mode == I915_TILING_X)
+ tile_width = 512;
+ else
+ tile_width = 128;
- /* 965 is flexible */
- return ALIGN(pitch, tile_width);
+ /* 965 is flexible */
+ return ALIGN(pitch, tile_width);
}
static struct bo_cache_bucket *
bucket_for_size(struct brw_bufmgr *bufmgr, unsigned long size)
{
- int i;
+ int i;
- for (i = 0; i < bufmgr->num_buckets; i++) {
- struct bo_cache_bucket *bucket =
- &bufmgr->cache_bucket[i];
- if (bucket->size >= size) {
- return bucket;
- }
- }
+ for (i = 0; i < bufmgr->num_buckets; i++) {
+ struct bo_cache_bucket *bucket = &bufmgr->cache_bucket[i];
+ if (bucket->size >= size) {
+ return bucket;
+ }
+ }
- return NULL;
+ return NULL;
}
inline void
brw_bo_reference(struct brw_bo *bo)
{
- p_atomic_inc(&bo->refcount);
+ p_atomic_inc(&bo->refcount);
}
int
brw_bo_busy(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_busy busy;
- int ret;
-
- memclear(busy);
- busy.handle = bo->gem_handle;
-
- ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
- if (ret == 0) {
- bo->idle = !busy.busy;
- return busy.busy;
- } else {
- return false;
- }
- return (ret == 0 && busy.busy);
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_busy busy;
+ int ret;
+
+ memclear(busy);
+ busy.handle = bo->gem_handle;
+
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
+ if (ret == 0) {
+ bo->idle = !busy.busy;
+ return busy.busy;
+ } else {
+ return false;
+ }
+ return (ret == 0 && busy.busy);
}
int
brw_bo_madvise(struct brw_bo *bo, int state)
{
- struct drm_i915_gem_madvise madv;
+ struct drm_i915_gem_madvise madv;
- memclear(madv);
- madv.handle = bo->gem_handle;
- madv.madv = state;
- madv.retained = 1;
- drmIoctl(bo->bufmgr->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
+ memclear(madv);
+ madv.handle = bo->gem_handle;
+ madv.madv = state;
+ madv.retained = 1;
+ drmIoctl(bo->bufmgr->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
- return madv.retained;
+ return madv.retained;
}
/* drop the oldest entries that have been purged by the kernel */
static void
brw_bo_cache_purge_bucket(struct brw_bufmgr *bufmgr,
- struct bo_cache_bucket *bucket)
+ struct bo_cache_bucket *bucket)
{
- while (!list_empty(&bucket->head)) {
- struct brw_bo *bo;
+ while (!list_empty(&bucket->head)) {
+ struct brw_bo *bo;
- bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
- if (brw_bo_madvise(bo, I915_MADV_DONTNEED))
- break;
+ bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
+ if (brw_bo_madvise(bo, I915_MADV_DONTNEED))
+ break;
- list_del(&bo->head);
- bo_free(bo);
- }
+ list_del(&bo->head);
+ bo_free(bo);
+ }
}
static struct brw_bo *
bo_alloc_internal(struct brw_bufmgr *bufmgr,
- const char *name,
- unsigned long size,
- unsigned long flags,
- uint32_t tiling_mode,
- unsigned long stride,
- unsigned int alignment)
+ const char *name,
+ unsigned long size,
+ unsigned long flags,
+ uint32_t tiling_mode,
+ unsigned long stride, unsigned int alignment)
{
- struct brw_bo *bo;
- unsigned int page_size = getpagesize();
- int ret;
- struct bo_cache_bucket *bucket;
- bool alloc_from_cache;
- unsigned long bo_size;
- bool for_render = false;
-
- if (flags & BO_ALLOC_FOR_RENDER)
- for_render = true;
-
- /* Round the allocated size up to a power of two number of pages. */
- bucket = bucket_for_size(bufmgr, size);
-
- /* If we don't have caching at this size, don't actually round the
- * allocation up.
- */
- if (bucket == NULL) {
- bo_size = size;
- if (bo_size < page_size)
- bo_size = page_size;
- } else {
- bo_size = bucket->size;
- }
-
- pthread_mutex_lock(&bufmgr->lock);
- /* Get a buffer out of the cache if available */
+ struct brw_bo *bo;
+ unsigned int page_size = getpagesize();
+ int ret;
+ struct bo_cache_bucket *bucket;
+ bool alloc_from_cache;
+ unsigned long bo_size;
+ bool for_render = false;
+
+ if (flags & BO_ALLOC_FOR_RENDER)
+ for_render = true;
+
+ /* Round the allocated size up to a power of two number of pages. */
+ bucket = bucket_for_size(bufmgr, size);
+
+ /* If we don't have caching at this size, don't actually round the
+ * allocation up.
+ */
+ if (bucket == NULL) {
+ bo_size = size;
+ if (bo_size < page_size)
+ bo_size = page_size;
+ } else {
+ bo_size = bucket->size;
+ }
+
+ pthread_mutex_lock(&bufmgr->lock);
+ /* Get a buffer out of the cache if available */
retry:
- alloc_from_cache = false;
- if (bucket != NULL && !list_empty(&bucket->head)) {
- if (for_render) {
- /* Allocate new render-target BOs from the tail (MRU)
- * of the list, as it will likely be hot in the GPU
- * cache and in the aperture for us.
- */
- bo = LIST_ENTRY(struct brw_bo, bucket->head.prev, head);
- list_del(&bo->head);
- alloc_from_cache = true;
- bo->align = alignment;
- } else {
- assert(alignment == 0);
- /* For non-render-target BOs (where we're probably
- * going to map it first thing in order to fill it
- * with data), check if the last BO in the cache is
- * unbusy, and only reuse in that case. Otherwise,
- * allocating a new buffer is probably faster than
- * waiting for the GPU to finish.
- */
- bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
- if (!brw_bo_busy(bo)) {
- alloc_from_cache = true;
- list_del(&bo->head);
- }
- }
-
- if (alloc_from_cache) {
- if (!brw_bo_madvise(bo, I915_MADV_WILLNEED)) {
- bo_free(bo);
- brw_bo_cache_purge_bucket(bufmgr,
- bucket);
- goto retry;
- }
-
- if (bo_set_tiling_internal(bo, tiling_mode, stride)) {
- bo_free(bo);
- goto retry;
- }
- }
- }
-
- if (!alloc_from_cache) {
- struct drm_i915_gem_create create;
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- goto err;
-
- /* bo_free calls list_del() for an uninitialized
- list (vma_list), so better set the list head here */
- list_inithead(&bo->vma_list);
-
- bo->size = bo_size;
-
- memclear(create);
- create.size = bo_size;
-
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_CREATE,
- &create);
- if (ret != 0) {
- free(bo);
- goto err;
- }
-
- bo->gem_handle = create.handle;
- _mesa_hash_table_insert(bufmgr->handle_table,
- &bo->gem_handle, bo);
-
- bo->bufmgr = bufmgr;
- bo->align = alignment;
-
- bo->tiling_mode = I915_TILING_NONE;
- bo->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
- bo->stride = 0;
-
- if (bo_set_tiling_internal(bo, tiling_mode, stride))
- goto err_free;
- }
-
- bo->name = name;
- p_atomic_set(&bo->refcount, 1);
- bo->reusable = true;
-
- pthread_mutex_unlock(&bufmgr->lock);
-
- DBG("bo_create: buf %d (%s) %ldb\n",
- bo->gem_handle, bo->name, size);
-
- return bo;
+ alloc_from_cache = false;
+ if (bucket != NULL && !list_empty(&bucket->head)) {
+ if (for_render) {
+ /* Allocate new render-target BOs from the tail (MRU)
+ * of the list, as it will likely be hot in the GPU
+ * cache and in the aperture for us.
+ */
+ bo = LIST_ENTRY(struct brw_bo, bucket->head.prev, head);
+ list_del(&bo->head);
+ alloc_from_cache = true;
+ bo->align = alignment;
+ } else {
+ assert(alignment == 0);
+ /* For non-render-target BOs (where we're probably
+ * going to map it first thing in order to fill it
+ * with data), check if the last BO in the cache is
+ * unbusy, and only reuse in that case. Otherwise,
+ * allocating a new buffer is probably faster than
+ * waiting for the GPU to finish.
+ */
+ bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
+ if (!brw_bo_busy(bo)) {
+ alloc_from_cache = true;
+ list_del(&bo->head);
+ }
+ }
+
+ if (alloc_from_cache) {
+ if (!brw_bo_madvise(bo, I915_MADV_WILLNEED)) {
+ bo_free(bo);
+ brw_bo_cache_purge_bucket(bufmgr, bucket);
+ goto retry;
+ }
+
+ if (bo_set_tiling_internal(bo, tiling_mode, stride)) {
+ bo_free(bo);
+ goto retry;
+ }
+ }
+ }
+
+ if (!alloc_from_cache) {
+ struct drm_i915_gem_create create;
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ goto err;
+
+ /* bo_free calls list_del() for an uninitialized
+ list (vma_list), so better set the list head here */
+ list_inithead(&bo->vma_list);
+
+ bo->size = bo_size;
+
+ memclear(create);
+ create.size = bo_size;
+
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CREATE, &create);
+ if (ret != 0) {
+ free(bo);
+ goto err;
+ }
+
+ bo->gem_handle = create.handle;
+ _mesa_hash_table_insert(bufmgr->handle_table, &bo->gem_handle, bo);
+
+ bo->bufmgr = bufmgr;
+ bo->align = alignment;
+
+ bo->tiling_mode = I915_TILING_NONE;
+ bo->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
+ bo->stride = 0;
+
+ if (bo_set_tiling_internal(bo, tiling_mode, stride))
+ goto err_free;
+ }
+
+ bo->name = name;
+ p_atomic_set(&bo->refcount, 1);
+ bo->reusable = true;
+
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ DBG("bo_create: buf %d (%s) %ldb\n", bo->gem_handle, bo->name, size);
+
+ return bo;
err_free:
- bo_free(bo);
+ bo_free(bo);
err:
- pthread_mutex_unlock(&bufmgr->lock);
- return NULL;
+ pthread_mutex_unlock(&bufmgr->lock);
+ return NULL;
}
struct brw_bo *
brw_bo_alloc_for_render(struct brw_bufmgr *bufmgr,
- const char *name,
- unsigned long size,
- unsigned int alignment)
+ const char *name,
+ unsigned long size, unsigned int alignment)
{
- return bo_alloc_internal(bufmgr, name, size, BO_ALLOC_FOR_RENDER,
- I915_TILING_NONE, 0, alignment);
+ return bo_alloc_internal(bufmgr, name, size, BO_ALLOC_FOR_RENDER,
+ I915_TILING_NONE, 0, alignment);
}
struct brw_bo *
brw_bo_alloc(struct brw_bufmgr *bufmgr,
- const char *name,
- unsigned long size,
- unsigned int alignment)
+ const char *name, unsigned long size, unsigned int alignment)
{
- return bo_alloc_internal(bufmgr, name, size, 0, I915_TILING_NONE, 0, 0);
+ return bo_alloc_internal(bufmgr, name, size, 0, I915_TILING_NONE, 0, 0);
}
struct brw_bo *
brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, const char *name,
- int x, int y, int cpp, uint32_t *tiling_mode,
- unsigned long *pitch, unsigned long flags)
+ int x, int y, int cpp, uint32_t *tiling_mode,
+ unsigned long *pitch, unsigned long flags)
{
- unsigned long size, stride;
- uint32_t tiling;
-
- do {
- unsigned long aligned_y, height_alignment;
-
- tiling = *tiling_mode;
-
- /* If we're tiled, our allocations are in 8 or 32-row blocks,
- * so failure to align our height means that we won't allocate
- * enough pages.
- *
- * If we're untiled, we still have to align to 2 rows high
- * because the data port accesses 2x2 blocks even if the
- * bottom row isn't to be rendered, so failure to align means
- * we could walk off the end of the GTT and fault. This is
- * documented on 965, and may be the case on older chipsets
- * too so we try to be careful.
- */
- aligned_y = y;
- height_alignment = 2;
-
- if (tiling == I915_TILING_X)
- height_alignment = 8;
- else if (tiling == I915_TILING_Y)
- height_alignment = 32;
- aligned_y = ALIGN(y, height_alignment);
-
- stride = x * cpp;
- stride = bo_tile_pitch(bufmgr, stride, tiling_mode);
- size = stride * aligned_y;
- size = bo_tile_size(bufmgr, size, tiling_mode);
- } while (*tiling_mode != tiling);
- *pitch = stride;
-
- if (tiling == I915_TILING_NONE)
- stride = 0;
-
- return bo_alloc_internal(bufmgr, name, size, flags, tiling, stride, 0);
+ unsigned long size, stride;
+ uint32_t tiling;
+
+ do {
+ unsigned long aligned_y, height_alignment;
+
+ tiling = *tiling_mode;
+
+ /* If we're tiled, our allocations are in 8 or 32-row blocks,
+ * so failure to align our height means that we won't allocate
+ * enough pages.
+ *
+ * If we're untiled, we still have to align to 2 rows high
+ * because the data port accesses 2x2 blocks even if the
+ * bottom row isn't to be rendered, so failure to align means
+ * we could walk off the end of the GTT and fault. This is
+ * documented on 965, and may be the case on older chipsets
+ * too so we try to be careful.
+ */
+ aligned_y = y;
+ height_alignment = 2;
+
+ if (tiling == I915_TILING_X)
+ height_alignment = 8;
+ else if (tiling == I915_TILING_Y)
+ height_alignment = 32;
+ aligned_y = ALIGN(y, height_alignment);
+
+ stride = x * cpp;
+ stride = bo_tile_pitch(bufmgr, stride, tiling_mode);
+ size = stride * aligned_y;
+ size = bo_tile_size(bufmgr, size, tiling_mode);
+ } while (*tiling_mode != tiling);
+ *pitch = stride;
+
+ if (tiling == I915_TILING_NONE)
+ stride = 0;
+
+ return bo_alloc_internal(bufmgr, name, size, flags, tiling, stride, 0);
}
/**
@@ -458,146 +448,139 @@ brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, const char *name,
*/
struct brw_bo *
brw_bo_gem_create_from_name(struct brw_bufmgr *bufmgr,
- const char *name,
- unsigned int handle)
+ const char *name, unsigned int handle)
{
- struct brw_bo *bo;
- int ret;
- struct drm_gem_open open_arg;
- struct drm_i915_gem_get_tiling get_tiling;
-
- /* At the moment most applications only have a few named bo.
- * For instance, in a DRI client only the render buffers passed
- * between X and the client are named. And since X returns the
- * alternating names for the front/back buffer a linear search
- * provides a sufficiently fast match.
- */
- pthread_mutex_lock(&bufmgr->lock);
- bo = hash_find_bo(bufmgr->name_table, handle);
- if (bo) {
- brw_bo_reference(bo);
- goto out;
- }
-
- memclear(open_arg);
- open_arg.name = handle;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_GEM_OPEN,
- &open_arg);
- if (ret != 0) {
- DBG("Couldn't reference %s handle 0x%08x: %s\n",
- name, handle, strerror(errno));
- bo = NULL;
- goto out;
- }
- /* Now see if someone has used a prime handle to get this
- * object from the kernel before by looking through the list
- * again for a matching gem_handle
- */
- bo = hash_find_bo(bufmgr->handle_table, open_arg.handle);
- if (bo) {
- brw_bo_reference(bo);
- goto out;
- }
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- goto out;
-
- p_atomic_set(&bo->refcount, 1);
- list_inithead(&bo->vma_list);
-
- bo->size = open_arg.size;
- bo->offset64 = 0;
- bo->virtual = NULL;
- bo->bufmgr = bufmgr;
- bo->gem_handle = open_arg.handle;
- bo->name = name;
- bo->global_name = handle;
- bo->reusable = false;
-
- _mesa_hash_table_insert(bufmgr->handle_table, &bo->gem_handle, bo);
- _mesa_hash_table_insert(bufmgr->name_table, &bo->global_name, bo);
-
- memclear(get_tiling);
- get_tiling.handle = bo->gem_handle;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_GET_TILING,
- &get_tiling);
- if (ret != 0)
- goto err_unref;
-
- bo->tiling_mode = get_tiling.tiling_mode;
- bo->swizzle_mode = get_tiling.swizzle_mode;
- /* XXX stride is unknown */
- DBG("bo_create_from_handle: %d (%s)\n", handle, bo->name);
+ struct brw_bo *bo;
+ int ret;
+ struct drm_gem_open open_arg;
+ struct drm_i915_gem_get_tiling get_tiling;
+
+ /* At the moment most applications only have a few named bo.
+ * For instance, in a DRI client only the render buffers passed
+ * between X and the client are named. And since X returns the
+ * alternating names for the front/back buffer a linear search
+ * provides a sufficiently fast match.
+ */
+ pthread_mutex_lock(&bufmgr->lock);
+ bo = hash_find_bo(bufmgr->name_table, handle);
+ if (bo) {
+ brw_bo_reference(bo);
+ goto out;
+ }
+
+ memclear(open_arg);
+ open_arg.name = handle;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
+ if (ret != 0) {
+ DBG("Couldn't reference %s handle 0x%08x: %s\n",
+ name, handle, strerror(errno));
+ bo = NULL;
+ goto out;
+ }
+ /* Now see if someone has used a prime handle to get this
+ * object from the kernel before by looking through the list
+ * again for a matching gem_handle
+ */
+ bo = hash_find_bo(bufmgr->handle_table, open_arg.handle);
+ if (bo) {
+ brw_bo_reference(bo);
+ goto out;
+ }
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ goto out;
+
+ p_atomic_set(&bo->refcount, 1);
+ list_inithead(&bo->vma_list);
+
+ bo->size = open_arg.size;
+ bo->offset64 = 0;
+ bo->virtual = NULL;
+ bo->bufmgr = bufmgr;
+ bo->gem_handle = open_arg.handle;
+ bo->name = name;
+ bo->global_name = handle;
+ bo->reusable = false;
+
+ _mesa_hash_table_insert(bufmgr->handle_table, &bo->gem_handle, bo);
+ _mesa_hash_table_insert(bufmgr->name_table, &bo->global_name, bo);
+
+ memclear(get_tiling);
+ get_tiling.handle = bo->gem_handle;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
+ if (ret != 0)
+ goto err_unref;
+
+ bo->tiling_mode = get_tiling.tiling_mode;
+ bo->swizzle_mode = get_tiling.swizzle_mode;
+ /* XXX stride is unknown */
+ DBG("bo_create_from_handle: %d (%s)\n", handle, bo->name);
out:
- pthread_mutex_unlock(&bufmgr->lock);
- return bo;
+ pthread_mutex_unlock(&bufmgr->lock);
+ return bo;
err_unref:
- bo_free(bo);
- pthread_mutex_unlock(&bufmgr->lock);
- return NULL;
+ bo_free(bo);
+ pthread_mutex_unlock(&bufmgr->lock);
+ return NULL;
}
static void
bo_free(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_gem_close close;
- struct hash_entry *entry;
- int ret;
-
- list_del(&bo->vma_list);
- if (bo->mem_virtual) {
- VG(VALGRIND_FREELIKE_BLOCK(bo->mem_virtual, 0));
- drm_munmap(bo->mem_virtual, bo->size);
- bufmgr->vma_count--;
- }
- if (bo->wc_virtual) {
- VG(VALGRIND_FREELIKE_BLOCK(bo->wc_virtual, 0));
- drm_munmap(bo->wc_virtual, bo->size);
- bufmgr->vma_count--;
- }
- if (bo->gtt_virtual) {
- drm_munmap(bo->gtt_virtual, bo->size);
- bufmgr->vma_count--;
- }
-
- if (bo->global_name) {
- entry = _mesa_hash_table_search(bufmgr->name_table,
- &bo->global_name);
- _mesa_hash_table_remove(bufmgr->name_table, entry);
- }
- entry = _mesa_hash_table_search(bufmgr->handle_table,
- &bo->gem_handle);
- _mesa_hash_table_remove(bufmgr->handle_table, entry);
-
- /* Close this object */
- memclear(close);
- close.handle = bo->gem_handle;
- ret = drmIoctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &close);
- if (ret != 0) {
- DBG("DRM_IOCTL_GEM_CLOSE %d failed (%s): %s\n",
- bo->gem_handle, bo->name, strerror(errno));
- }
- free(bo);
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_gem_close close;
+ struct hash_entry *entry;
+ int ret;
+
+ list_del(&bo->vma_list);
+ if (bo->mem_virtual) {
+ VG(VALGRIND_FREELIKE_BLOCK(bo->mem_virtual, 0));
+ drm_munmap(bo->mem_virtual, bo->size);
+ bufmgr->vma_count--;
+ }
+ if (bo->wc_virtual) {
+ VG(VALGRIND_FREELIKE_BLOCK(bo->wc_virtual, 0));
+ drm_munmap(bo->wc_virtual, bo->size);
+ bufmgr->vma_count--;
+ }
+ if (bo->gtt_virtual) {
+ drm_munmap(bo->gtt_virtual, bo->size);
+ bufmgr->vma_count--;
+ }
+
+ if (bo->global_name) {
+ entry = _mesa_hash_table_search(bufmgr->name_table, &bo->global_name);
+ _mesa_hash_table_remove(bufmgr->name_table, entry);
+ }
+ entry = _mesa_hash_table_search(bufmgr->handle_table, &bo->gem_handle);
+ _mesa_hash_table_remove(bufmgr->handle_table, entry);
+
+ /* Close this object */
+ memclear(close);
+ close.handle = bo->gem_handle;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_GEM_CLOSE, &close);
+ if (ret != 0) {
+ DBG("DRM_IOCTL_GEM_CLOSE %d failed (%s): %s\n",
+ bo->gem_handle, bo->name, strerror(errno));
+ }
+ free(bo);
}
static void
bo_mark_mmaps_incoherent(struct brw_bo *bo)
{
#if HAVE_VALGRIND
- if (bo->mem_virtual)
- VALGRIND_MAKE_MEM_NOACCESS(bo->mem_virtual, bo->size);
+ if (bo->mem_virtual)
+ VALGRIND_MAKE_MEM_NOACCESS(bo->mem_virtual, bo->size);
- if (bo->wc_virtual)
- VALGRIND_MAKE_MEM_NOACCESS(bo->wc_virtual, bo->size);
+ if (bo->wc_virtual)
+ VALGRIND_MAKE_MEM_NOACCESS(bo->wc_virtual, bo->size);
- if (bo->gtt_virtual)
- VALGRIND_MAKE_MEM_NOACCESS(bo->gtt_virtual, bo->size);
+ if (bo->gtt_virtual)
+ VALGRIND_MAKE_MEM_NOACCESS(bo->gtt_virtual, bo->size);
#endif
}
@@ -605,321 +588,302 @@ bo_mark_mmaps_incoherent(struct brw_bo *bo)
static void
cleanup_bo_cache(struct brw_bufmgr *bufmgr, time_t time)
{
- int i;
+ int i;
- if (bufmgr->time == time)
- return;
+ if (bufmgr->time == time)
+ return;
- for (i = 0; i < bufmgr->num_buckets; i++) {
- struct bo_cache_bucket *bucket =
- &bufmgr->cache_bucket[i];
+ for (i = 0; i < bufmgr->num_buckets; i++) {
+ struct bo_cache_bucket *bucket = &bufmgr->cache_bucket[i];
- while (!list_empty(&bucket->head)) {
- struct brw_bo *bo;
+ while (!list_empty(&bucket->head)) {
+ struct brw_bo *bo;
- bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
- if (time - bo->free_time <= 1)
- break;
+ bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
+ if (time - bo->free_time <= 1)
+ break;
- list_del(&bo->head);
+ list_del(&bo->head);
- bo_free(bo);
- }
- }
+ bo_free(bo);
+ }
+ }
- bufmgr->time = time;
+ bufmgr->time = time;
}
static void
bo_purge_vma_cache(struct brw_bufmgr *bufmgr)
{
- int limit;
-
- DBG("%s: cached=%d, open=%d, limit=%d\n", __FUNCTION__,
- bufmgr->vma_count, bufmgr->vma_open, bufmgr->vma_max);
-
- if (bufmgr->vma_max < 0)
- return;
-
- /* We may need to evict a few entries in order to create new mmaps */
- limit = bufmgr->vma_max - 2*bufmgr->vma_open;
- if (limit < 0)
- limit = 0;
-
- while (bufmgr->vma_count > limit) {
- struct brw_bo *bo;
-
- bo = LIST_ENTRY(struct brw_bo, bufmgr->vma_cache.next, vma_list);
- assert(bo->map_count == 0);
- list_delinit(&bo->vma_list);
-
- if (bo->mem_virtual) {
- drm_munmap(bo->mem_virtual, bo->size);
- bo->mem_virtual = NULL;
- bufmgr->vma_count--;
- }
- if (bo->wc_virtual) {
- drm_munmap(bo->wc_virtual, bo->size);
- bo->wc_virtual = NULL;
- bufmgr->vma_count--;
- }
- if (bo->gtt_virtual) {
- drm_munmap(bo->gtt_virtual, bo->size);
- bo->gtt_virtual = NULL;
- bufmgr->vma_count--;
- }
- }
+ int limit;
+
+ DBG("%s: cached=%d, open=%d, limit=%d\n", __FUNCTION__,
+ bufmgr->vma_count, bufmgr->vma_open, bufmgr->vma_max);
+
+ if (bufmgr->vma_max < 0)
+ return;
+
+ /* We may need to evict a few entries in order to create new mmaps */
+ limit = bufmgr->vma_max - 2 * bufmgr->vma_open;
+ if (limit < 0)
+ limit = 0;
+
+ while (bufmgr->vma_count > limit) {
+ struct brw_bo *bo;
+
+ bo = LIST_ENTRY(struct brw_bo, bufmgr->vma_cache.next, vma_list);
+ assert(bo->map_count == 0);
+ list_delinit(&bo->vma_list);
+
+ if (bo->mem_virtual) {
+ drm_munmap(bo->mem_virtual, bo->size);
+ bo->mem_virtual = NULL;
+ bufmgr->vma_count--;
+ }
+ if (bo->wc_virtual) {
+ drm_munmap(bo->wc_virtual, bo->size);
+ bo->wc_virtual = NULL;
+ bufmgr->vma_count--;
+ }
+ if (bo->gtt_virtual) {
+ drm_munmap(bo->gtt_virtual, bo->size);
+ bo->gtt_virtual = NULL;
+ bufmgr->vma_count--;
+ }
+ }
}
static void
bo_close_vma(struct brw_bufmgr *bufmgr, struct brw_bo *bo)
{
- bufmgr->vma_open--;
- list_addtail(&bo->vma_list, &bufmgr->vma_cache);
- if (bo->mem_virtual)
- bufmgr->vma_count++;
- if (bo->wc_virtual)
- bufmgr->vma_count++;
- if (bo->gtt_virtual)
- bufmgr->vma_count++;
- bo_purge_vma_cache(bufmgr);
+ bufmgr->vma_open--;
+ list_addtail(&bo->vma_list, &bufmgr->vma_cache);
+ if (bo->mem_virtual)
+ bufmgr->vma_count++;
+ if (bo->wc_virtual)
+ bufmgr->vma_count++;
+ if (bo->gtt_virtual)
+ bufmgr->vma_count++;
+ bo_purge_vma_cache(bufmgr);
}
static void
bo_open_vma(struct brw_bufmgr *bufmgr, struct brw_bo *bo)
{
- bufmgr->vma_open++;
- list_del(&bo->vma_list);
- if (bo->mem_virtual)
- bufmgr->vma_count--;
- if (bo->wc_virtual)
- bufmgr->vma_count--;
- if (bo->gtt_virtual)
- bufmgr->vma_count--;
- bo_purge_vma_cache(bufmgr);
+ bufmgr->vma_open++;
+ list_del(&bo->vma_list);
+ if (bo->mem_virtual)
+ bufmgr->vma_count--;
+ if (bo->wc_virtual)
+ bufmgr->vma_count--;
+ if (bo->gtt_virtual)
+ bufmgr->vma_count--;
+ bo_purge_vma_cache(bufmgr);
}
static void
bo_unreference_final(struct brw_bo *bo, time_t time)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct bo_cache_bucket *bucket;
-
- DBG("bo_unreference final: %d (%s)\n",
- bo->gem_handle, bo->name);
-
- /* Clear any left-over mappings */
- if (bo->map_count) {
- DBG("bo freed with non-zero map-count %d\n", bo->map_count);
- bo->map_count = 0;
- bo_close_vma(bufmgr, bo);
- bo_mark_mmaps_incoherent(bo);
- }
-
- bucket = bucket_for_size(bufmgr, bo->size);
- /* Put the buffer into our internal cache for reuse if we can. */
- if (bufmgr->bo_reuse && bo->reusable && bucket != NULL &&
- brw_bo_madvise(bo, I915_MADV_DONTNEED)) {
- bo->free_time = time;
-
- bo->name = NULL;
-
- list_addtail(&bo->head, &bucket->head);
- } else {
- bo_free(bo);
- }
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct bo_cache_bucket *bucket;
+
+ DBG("bo_unreference final: %d (%s)\n", bo->gem_handle, bo->name);
+
+ /* Clear any left-over mappings */
+ if (bo->map_count) {
+ DBG("bo freed with non-zero map-count %d\n", bo->map_count);
+ bo->map_count = 0;
+ bo_close_vma(bufmgr, bo);
+ bo_mark_mmaps_incoherent(bo);
+ }
+
+ bucket = bucket_for_size(bufmgr, bo->size);
+ /* Put the buffer into our internal cache for reuse if we can. */
+ if (bufmgr->bo_reuse && bo->reusable && bucket != NULL &&
+ brw_bo_madvise(bo, I915_MADV_DONTNEED)) {
+ bo->free_time = time;
+
+ bo->name = NULL;
+
+ list_addtail(&bo->head, &bucket->head);
+ } else {
+ bo_free(bo);
+ }
}
void
brw_bo_unreference(struct brw_bo *bo)
{
- if (bo == NULL)
- return;
+ if (bo == NULL)
+ return;
- assert(p_atomic_read(&bo->refcount) > 0);
+ assert(p_atomic_read(&bo->refcount) > 0);
- if (atomic_add_unless(&bo->refcount, -1, 1)) {
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct timespec time;
+ if (atomic_add_unless(&bo->refcount, -1, 1)) {
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct timespec time;
- clock_gettime(CLOCK_MONOTONIC, &time);
+ clock_gettime(CLOCK_MONOTONIC, &time);
- pthread_mutex_lock(&bufmgr->lock);
+ pthread_mutex_lock(&bufmgr->lock);
- if (p_atomic_dec_zero(&bo->refcount)) {
- bo_unreference_final(bo, time.tv_sec);
- cleanup_bo_cache(bufmgr, time.tv_sec);
- }
+ if (p_atomic_dec_zero(&bo->refcount)) {
+ bo_unreference_final(bo, time.tv_sec);
+ cleanup_bo_cache(bufmgr, time.tv_sec);
+ }
- pthread_mutex_unlock(&bufmgr->lock);
- }
+ pthread_mutex_unlock(&bufmgr->lock);
+ }
}
int
brw_bo_map(struct brw_bo *bo, int write_enable)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_set_domain set_domain;
- int ret;
-
- pthread_mutex_lock(&bufmgr->lock);
-
- if (bo->map_count++ == 0)
- bo_open_vma(bufmgr, bo);
-
- if (!bo->mem_virtual) {
- struct drm_i915_gem_mmap mmap_arg;
-
- DBG("bo_map: %d (%s), map_count=%d\n",
- bo->gem_handle, bo->name, bo->map_count);
-
- memclear(mmap_arg);
- mmap_arg.handle = bo->gem_handle;
- mmap_arg.size = bo->size;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_MMAP,
- &mmap_arg);
- if (ret != 0) {
- ret = -errno;
- DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
- __FILE__, __LINE__, bo->gem_handle,
- bo->name, strerror(errno));
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- pthread_mutex_unlock(&bufmgr->lock);
- return ret;
- }
- VG(VALGRIND_MALLOCLIKE_BLOCK(mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
- bo->mem_virtual = (void *)(uintptr_t) mmap_arg.addr_ptr;
- }
- DBG("bo_map: %d (%s) -> %p\n", bo->gem_handle, bo->name,
- bo->mem_virtual);
- bo->virtual = bo->mem_virtual;
-
- memclear(set_domain);
- set_domain.handle = bo->gem_handle;
- set_domain.read_domains = I915_GEM_DOMAIN_CPU;
- if (write_enable)
- set_domain.write_domain = I915_GEM_DOMAIN_CPU;
- else
- set_domain.write_domain = 0;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- if (ret != 0) {
- DBG("%s:%d: Error setting to CPU domain %d: %s\n",
- __FILE__, __LINE__, bo->gem_handle,
- strerror(errno));
- }
-
- bo_mark_mmaps_incoherent(bo);
- VG(VALGRIND_MAKE_MEM_DEFINED(bo->mem_virtual, bo->size));
- pthread_mutex_unlock(&bufmgr->lock);
-
- return 0;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_set_domain set_domain;
+ int ret;
+
+ pthread_mutex_lock(&bufmgr->lock);
+
+ if (bo->map_count++ == 0)
+ bo_open_vma(bufmgr, bo);
+
+ if (!bo->mem_virtual) {
+ struct drm_i915_gem_mmap mmap_arg;
+
+ DBG("bo_map: %d (%s), map_count=%d\n",
+ bo->gem_handle, bo->name, bo->map_count);
+
+ memclear(mmap_arg);
+ mmap_arg.handle = bo->gem_handle;
+ mmap_arg.size = bo->size;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg);
+ if (ret != 0) {
+ ret = -errno;
+ DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ pthread_mutex_unlock(&bufmgr->lock);
+ return ret;
+ }
+ VG(VALGRIND_MALLOCLIKE_BLOCK(mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
+ bo->mem_virtual = (void *) (uintptr_t) mmap_arg.addr_ptr;
+ }
+ DBG("bo_map: %d (%s) -> %p\n", bo->gem_handle, bo->name, bo->mem_virtual);
+ bo->virtual = bo->mem_virtual;
+
+ memclear(set_domain);
+ set_domain.handle = bo->gem_handle;
+ set_domain.read_domains = I915_GEM_DOMAIN_CPU;
+ if (write_enable)
+ set_domain.write_domain = I915_GEM_DOMAIN_CPU;
+ else
+ set_domain.write_domain = 0;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
+ if (ret != 0) {
+ DBG("%s:%d: Error setting to CPU domain %d: %s\n",
+ __FILE__, __LINE__, bo->gem_handle, strerror(errno));
+ }
+
+ bo_mark_mmaps_incoherent(bo);
+ VG(VALGRIND_MAKE_MEM_DEFINED(bo->mem_virtual, bo->size));
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return 0;
}
static int
map_gtt(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- int ret;
-
- if (bo->map_count++ == 0)
- bo_open_vma(bufmgr, bo);
-
- /* Get a mapping of the buffer if we haven't before. */
- if (bo->gtt_virtual == NULL) {
- struct drm_i915_gem_mmap_gtt mmap_arg;
-
- DBG("bo_map_gtt: mmap %d (%s), map_count=%d\n",
- bo->gem_handle, bo->name, bo->map_count);
-
- memclear(mmap_arg);
- mmap_arg.handle = bo->gem_handle;
-
- /* Get the fake offset back... */
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_MMAP_GTT,
- &mmap_arg);
- if (ret != 0) {
- ret = -errno;
- DBG("%s:%d: Error preparing buffer map %d (%s): %s .\n",
- __FILE__, __LINE__,
- bo->gem_handle, bo->name,
- strerror(errno));
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- return ret;
- }
-
- /* and mmap it */
- bo->gtt_virtual = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
- MAP_SHARED, bufmgr->fd,
- mmap_arg.offset);
- if (bo->gtt_virtual == MAP_FAILED) {
- bo->gtt_virtual = NULL;
- ret = -errno;
- DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
- __FILE__, __LINE__,
- bo->gem_handle, bo->name,
- strerror(errno));
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- return ret;
- }
- }
-
- bo->virtual = bo->gtt_virtual;
-
- DBG("bo_map_gtt: %d (%s) -> %p\n", bo->gem_handle, bo->name,
- bo->gtt_virtual);
-
- return 0;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ int ret;
+
+ if (bo->map_count++ == 0)
+ bo_open_vma(bufmgr, bo);
+
+ /* Get a mapping of the buffer if we haven't before. */
+ if (bo->gtt_virtual == NULL) {
+ struct drm_i915_gem_mmap_gtt mmap_arg;
+
+ DBG("bo_map_gtt: mmap %d (%s), map_count=%d\n",
+ bo->gem_handle, bo->name, bo->map_count);
+
+ memclear(mmap_arg);
+ mmap_arg.handle = bo->gem_handle;
+
+ /* Get the fake offset back... */
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg);
+ if (ret != 0) {
+ ret = -errno;
+ DBG("%s:%d: Error preparing buffer map %d (%s): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ return ret;
+ }
+
+ /* and mmap it */
+ bo->gtt_virtual = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, bufmgr->fd, mmap_arg.offset);
+ if (bo->gtt_virtual == MAP_FAILED) {
+ bo->gtt_virtual = NULL;
+ ret = -errno;
+ DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ return ret;
+ }
+ }
+
+ bo->virtual = bo->gtt_virtual;
+
+ DBG("bo_map_gtt: %d (%s) -> %p\n", bo->gem_handle, bo->name,
+ bo->gtt_virtual);
+
+ return 0;
}
int
brw_bo_map_gtt(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_set_domain set_domain;
- int ret;
-
- pthread_mutex_lock(&bufmgr->lock);
-
- ret = map_gtt(bo);
- if (ret) {
- pthread_mutex_unlock(&bufmgr->lock);
- return ret;
- }
-
- /* Now move it to the GTT domain so that the GPU and CPU
- * caches are flushed and the GPU isn't actively using the
- * buffer.
- *
- * The pagefault handler does this domain change for us when
- * it has unbound the BO from the GTT, but it's up to us to
- * tell it when we're about to use things if we had done
- * rendering and it still happens to be bound to the GTT.
- */
- memclear(set_domain);
- set_domain.handle = bo->gem_handle;
- set_domain.read_domains = I915_GEM_DOMAIN_GTT;
- set_domain.write_domain = I915_GEM_DOMAIN_GTT;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- if (ret != 0) {
- DBG("%s:%d: Error setting domain %d: %s\n",
- __FILE__, __LINE__, bo->gem_handle,
- strerror(errno));
- }
-
- bo_mark_mmaps_incoherent(bo);
- VG(VALGRIND_MAKE_MEM_DEFINED(bo->gtt_virtual, bo->size));
- pthread_mutex_unlock(&bufmgr->lock);
-
- return 0;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_set_domain set_domain;
+ int ret;
+
+ pthread_mutex_lock(&bufmgr->lock);
+
+ ret = map_gtt(bo);
+ if (ret) {
+ pthread_mutex_unlock(&bufmgr->lock);
+ return ret;
+ }
+
+ /* Now move it to the GTT domain so that the GPU and CPU
+ * caches are flushed and the GPU isn't actively using the
+ * buffer.
+ *
+ * The pagefault handler does this domain change for us when
+ * it has unbound the BO from the GTT, but it's up to us to
+ * tell it when we're about to use things if we had done
+ * rendering and it still happens to be bound to the GTT.
+ */
+ memclear(set_domain);
+ set_domain.handle = bo->gem_handle;
+ set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+ set_domain.write_domain = I915_GEM_DOMAIN_GTT;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
+ if (ret != 0) {
+ DBG("%s:%d: Error setting domain %d: %s\n",
+ __FILE__, __LINE__, bo->gem_handle, strerror(errno));
+ }
+
+ bo_mark_mmaps_incoherent(bo);
+ VG(VALGRIND_MAKE_MEM_DEFINED(bo->gtt_virtual, bo->size));
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return 0;
}
/**
@@ -939,125 +903,121 @@ brw_bo_map_gtt(struct brw_bo *bo)
int
brw_bo_map_unsynchronized(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
#ifdef HAVE_VALGRIND
#endif
- int ret;
+ int ret;
- /* If the CPU cache isn't coherent with the GTT, then use a
- * regular synchronized mapping. The problem is that we don't
- * track where the buffer was last used on the CPU side in
- * terms of brw_bo_map vs brw_bo_map_gtt, so
- * we would potentially corrupt the buffer even when the user
- * does reasonable things.
- */
- if (!bufmgr->has_llc)
- return brw_bo_map_gtt(bo);
+ /* If the CPU cache isn't coherent with the GTT, then use a
+ * regular synchronized mapping. The problem is that we don't
+ * track where the buffer was last used on the CPU side in
+ * terms of brw_bo_map vs brw_bo_map_gtt, so
+ * we would potentially corrupt the buffer even when the user
+ * does reasonable things.
+ */
+ if (!bufmgr->has_llc)
+ return brw_bo_map_gtt(bo);
- pthread_mutex_lock(&bufmgr->lock);
+ pthread_mutex_lock(&bufmgr->lock);
- ret = map_gtt(bo);
- if (ret == 0) {
- bo_mark_mmaps_incoherent(bo);
- VG(VALGRIND_MAKE_MEM_DEFINED(bo->gtt_virtual, bo->size));
- }
+ ret = map_gtt(bo);
+ if (ret == 0) {
+ bo_mark_mmaps_incoherent(bo);
+ VG(VALGRIND_MAKE_MEM_DEFINED(bo->gtt_virtual, bo->size));
+ }
- pthread_mutex_unlock(&bufmgr->lock);
+ pthread_mutex_unlock(&bufmgr->lock);
- return ret;
+ return ret;
}
int
brw_bo_unmap(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- int ret = 0;
-
- if (bo == NULL)
- return 0;
-
- pthread_mutex_lock(&bufmgr->lock);
-
- if (bo->map_count <= 0) {
- DBG("attempted to unmap an unmapped bo\n");
- pthread_mutex_unlock(&bufmgr->lock);
- /* Preserve the old behaviour of just treating this as a
- * no-op rather than reporting the error.
- */
- return 0;
- }
-
- /* We need to unmap after every innovation as we cannot track
- * an open vma for every bo as that will exhaust the system
- * limits and cause later failures.
- */
- if (--bo->map_count == 0) {
- bo_close_vma(bufmgr, bo);
- bo_mark_mmaps_incoherent(bo);
- bo->virtual = NULL;
- }
- pthread_mutex_unlock(&bufmgr->lock);
-
- return ret;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ int ret = 0;
+
+ if (bo == NULL)
+ return 0;
+
+ pthread_mutex_lock(&bufmgr->lock);
+
+ if (bo->map_count <= 0) {
+ DBG("attempted to unmap an unmapped bo\n");
+ pthread_mutex_unlock(&bufmgr->lock);
+ /* Preserve the old behaviour of just treating this as a
+ * no-op rather than reporting the error.
+ */
+ return 0;
+ }
+
+ /* We need to unmap after every innovation as we cannot track
+ * an open vma for every bo as that will exhaust the system
+ * limits and cause later failures.
+ */
+ if (--bo->map_count == 0) {
+ bo_close_vma(bufmgr, bo);
+ bo_mark_mmaps_incoherent(bo);
+ bo->virtual = NULL;
+ }
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return ret;
}
int
brw_bo_subdata(struct brw_bo *bo, unsigned long offset,
- unsigned long size, const void *data)
+ unsigned long size, const void *data)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_pwrite pwrite;
- int ret;
-
- memclear(pwrite);
- pwrite.handle = bo->gem_handle;
- pwrite.offset = offset;
- pwrite.size = size;
- pwrite.data_ptr = (uint64_t) (uintptr_t) data;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_PWRITE,
- &pwrite);
- if (ret != 0) {
- ret = -errno;
- DBG("%s:%d: Error writing data to buffer %d: (%d %d) %s .\n",
- __FILE__, __LINE__, bo->gem_handle, (int)offset,
- (int)size, strerror(errno));
- }
-
- return ret;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_pwrite pwrite;
+ int ret;
+
+ memclear(pwrite);
+ pwrite.handle = bo->gem_handle;
+ pwrite.offset = offset;
+ pwrite.size = size;
+ pwrite.data_ptr = (uint64_t) (uintptr_t) data;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
+ if (ret != 0) {
+ ret = -errno;
+ DBG("%s:%d: Error writing data to buffer %d: (%d %d) %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, (int) offset,
+ (int) size, strerror(errno));
+ }
+
+ return ret;
}
int
brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
- unsigned long size, void *data)
+ unsigned long size, void *data)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_pread pread;
- int ret;
-
- memclear(pread);
- pread.handle = bo->gem_handle;
- pread.offset = offset;
- pread.size = size;
- pread.data_ptr = (uint64_t) (uintptr_t) data;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_PREAD,
- &pread);
- if (ret != 0) {
- ret = -errno;
- DBG("%s:%d: Error reading data from buffer %d: (%d %d) %s .\n",
- __FILE__, __LINE__, bo->gem_handle, (int)offset,
- (int)size, strerror(errno));
- }
-
- return ret;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_pread pread;
+ int ret;
+
+ memclear(pread);
+ pread.handle = bo->gem_handle;
+ pread.offset = offset;
+ pread.size = size;
+ pread.data_ptr = (uint64_t) (uintptr_t) data;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_PREAD, &pread);
+ if (ret != 0) {
+ ret = -errno;
+ DBG("%s:%d: Error reading data from buffer %d: (%d %d) %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, (int) offset,
+ (int) size, strerror(errno));
+ }
+
+ return ret;
}
/** Waits for all GPU rendering with the object to have completed. */
void
brw_bo_wait_rendering(struct brw_bo *bo)
{
- brw_bo_start_gtt_access(bo, 1);
+ brw_bo_start_gtt_access(bo, 1);
}
/**
@@ -1090,18 +1050,18 @@ brw_bo_wait_rendering(struct brw_bo *bo)
int
brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_wait wait;
- int ret;
-
- memclear(wait);
- wait.bo_handle = bo->gem_handle;
- wait.timeout_ns = timeout_ns;
- ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_WAIT, &wait);
- if (ret == -1)
- return -errno;
-
- return ret;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_wait wait;
+ int ret;
+
+ memclear(wait);
+ wait.bo_handle = bo->gem_handle;
+ wait.timeout_ns = timeout_ns;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_WAIT, &wait);
+ if (ret == -1)
+ return -errno;
+
+ return ret;
}
/**
@@ -1114,227 +1074,218 @@ brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns)
void
brw_bo_start_gtt_access(struct brw_bo *bo, int write_enable)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_set_domain set_domain;
- int ret;
-
- memclear(set_domain);
- set_domain.handle = bo->gem_handle;
- set_domain.read_domains = I915_GEM_DOMAIN_GTT;
- set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0;
- ret = drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- if (ret != 0) {
- DBG("%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
- __FILE__, __LINE__, bo->gem_handle,
- set_domain.read_domains, set_domain.write_domain,
- strerror(errno));
- }
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_set_domain set_domain;
+ int ret;
+
+ memclear(set_domain);
+ set_domain.handle = bo->gem_handle;
+ set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+ set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0;
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
+ if (ret != 0) {
+ DBG("%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle,
+ set_domain.read_domains, set_domain.write_domain, strerror(errno));
+ }
}
void
brw_bufmgr_destroy(struct brw_bufmgr *bufmgr)
{
- pthread_mutex_destroy(&bufmgr->lock);
+ pthread_mutex_destroy(&bufmgr->lock);
- /* Free any cached buffer objects we were going to reuse */
- for (int i = 0; i < bufmgr->num_buckets; i++) {
- struct bo_cache_bucket *bucket =
- &bufmgr->cache_bucket[i];
- struct brw_bo *bo;
+ /* Free any cached buffer objects we were going to reuse */
+ for (int i = 0; i < bufmgr->num_buckets; i++) {
+ struct bo_cache_bucket *bucket = &bufmgr->cache_bucket[i];
+ struct brw_bo *bo;
- while (!list_empty(&bucket->head)) {
- bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
- list_del(&bo->head);
+ while (!list_empty(&bucket->head)) {
+ bo = LIST_ENTRY(struct brw_bo, bucket->head.next, head);
+ list_del(&bo->head);
- bo_free(bo);
- }
- }
+ bo_free(bo);
+ }
+ }
- _mesa_hash_table_destroy(bufmgr->name_table, NULL);
- _mesa_hash_table_destroy(bufmgr->handle_table, NULL);
+ _mesa_hash_table_destroy(bufmgr->name_table, NULL);
+ _mesa_hash_table_destroy(bufmgr->handle_table, NULL);
- free(bufmgr);
+ free(bufmgr);
}
static int
-bo_set_tiling_internal(struct brw_bo *bo, uint32_t tiling_mode, uint32_t stride)
+bo_set_tiling_internal(struct brw_bo *bo, uint32_t tiling_mode,
+ uint32_t stride)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
- struct drm_i915_gem_set_tiling set_tiling;
- int ret;
-
- if (bo->global_name == 0 &&
- tiling_mode == bo->tiling_mode &&
- stride == bo->stride)
- return 0;
-
- memset(&set_tiling, 0, sizeof(set_tiling));
- do {
- /* set_tiling is slightly broken and overwrites the
- * input on the error path, so we have to open code
- * rmIoctl.
- */
- set_tiling.handle = bo->gem_handle;
- set_tiling.tiling_mode = tiling_mode;
- set_tiling.stride = stride;
-
- ret = ioctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_SET_TILING,
- &set_tiling);
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
- if (ret == -1)
- return -errno;
-
- bo->tiling_mode = set_tiling.tiling_mode;
- bo->swizzle_mode = set_tiling.swizzle_mode;
- bo->stride = set_tiling.stride;
- return 0;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct drm_i915_gem_set_tiling set_tiling;
+ int ret;
+
+ if (bo->global_name == 0 &&
+ tiling_mode == bo->tiling_mode && stride == bo->stride)
+ return 0;
+
+ memset(&set_tiling, 0, sizeof(set_tiling));
+ do {
+ /* set_tiling is slightly broken and overwrites the
+ * input on the error path, so we have to open code
+ * rmIoctl.
+ */
+ set_tiling.handle = bo->gem_handle;
+ set_tiling.tiling_mode = tiling_mode;
+ set_tiling.stride = stride;
+
+ ret = ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling);
+ } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+ if (ret == -1)
+ return -errno;
+
+ bo->tiling_mode = set_tiling.tiling_mode;
+ bo->swizzle_mode = set_tiling.swizzle_mode;
+ bo->stride = set_tiling.stride;
+ return 0;
}
int
-brw_bo_set_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
- uint32_t stride)
+brw_bo_set_tiling(struct brw_bo *bo, uint32_t *tiling_mode, uint32_t stride)
{
- int ret;
+ int ret;
- /* Linear buffers have no stride. By ensuring that we only ever use
- * stride 0 with linear buffers, we simplify our code.
- */
- if (*tiling_mode == I915_TILING_NONE)
- stride = 0;
+ /* Linear buffers have no stride. By ensuring that we only ever use
+ * stride 0 with linear buffers, we simplify our code.
+ */
+ if (*tiling_mode == I915_TILING_NONE)
+ stride = 0;
- ret = bo_set_tiling_internal(bo, *tiling_mode, stride);
+ ret = bo_set_tiling_internal(bo, *tiling_mode, stride);
- *tiling_mode = bo->tiling_mode;
- return ret;
+ *tiling_mode = bo->tiling_mode;
+ return ret;
}
int
-brw_bo_get_tiling(struct brw_bo *bo, uint32_t * tiling_mode,
- uint32_t *swizzle_mode)
+brw_bo_get_tiling(struct brw_bo *bo, uint32_t *tiling_mode,
+ uint32_t *swizzle_mode)
{
- *tiling_mode = bo->tiling_mode;
- *swizzle_mode = bo->swizzle_mode;
- return 0;
+ *tiling_mode = bo->tiling_mode;
+ *swizzle_mode = bo->swizzle_mode;
+ return 0;
}
struct brw_bo *
-brw_bo_gem_create_from_prime(struct brw_bufmgr *bufmgr, int prime_fd, int size)
+brw_bo_gem_create_from_prime(struct brw_bufmgr *bufmgr, int prime_fd,
+ int size)
{
- int ret;
- uint32_t handle;
- struct brw_bo *bo;
- struct drm_i915_gem_get_tiling get_tiling;
-
- pthread_mutex_lock(&bufmgr->lock);
- ret = drmPrimeFDToHandle(bufmgr->fd, prime_fd, &handle);
- if (ret) {
- DBG("create_from_prime: failed to obtain handle from fd: %s\n", strerror(errno));
- pthread_mutex_unlock(&bufmgr->lock);
- return NULL;
- }
-
- /*
- * See if the kernel has already returned this buffer to us. Just as
- * for named buffers, we must not create two bo's pointing at the same
- * kernel object
- */
- bo = hash_find_bo(bufmgr->handle_table, handle);
- if (bo) {
- brw_bo_reference(bo);
- goto out;
- }
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- goto out;
-
- p_atomic_set(&bo->refcount, 1);
- list_inithead(&bo->vma_list);
-
- /* Determine size of bo. The fd-to-handle ioctl really should
- * return the size, but it doesn't. If we have kernel 3.12 or
- * later, we can lseek on the prime fd to get the size. Older
- * kernels will just fail, in which case we fall back to the
- * provided (estimated or guess size). */
- ret = lseek(prime_fd, 0, SEEK_END);
- if (ret != -1)
- bo->size = ret;
- else
- bo->size = size;
-
- bo->bufmgr = bufmgr;
-
- bo->gem_handle = handle;
- _mesa_hash_table_insert(bufmgr->handle_table,
- &bo->gem_handle, bo);
-
- bo->name = "prime";
- bo->reusable = false;
-
- memclear(get_tiling);
- get_tiling.handle = bo->gem_handle;
- if (drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_GET_TILING,
- &get_tiling))
- goto err;
-
- bo->tiling_mode = get_tiling.tiling_mode;
- bo->swizzle_mode = get_tiling.swizzle_mode;
- /* XXX stride is unknown */
+ int ret;
+ uint32_t handle;
+ struct brw_bo *bo;
+ struct drm_i915_gem_get_tiling get_tiling;
+
+ pthread_mutex_lock(&bufmgr->lock);
+ ret = drmPrimeFDToHandle(bufmgr->fd, prime_fd, &handle);
+ if (ret) {
+ DBG("create_from_prime: failed to obtain handle from fd: %s\n",
+ strerror(errno));
+ pthread_mutex_unlock(&bufmgr->lock);
+ return NULL;
+ }
+
+ /*
+ * See if the kernel has already returned this buffer to us. Just as
+ * for named buffers, we must not create two bo's pointing at the same
+ * kernel object
+ */
+ bo = hash_find_bo(bufmgr->handle_table, handle);
+ if (bo) {
+ brw_bo_reference(bo);
+ goto out;
+ }
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ goto out;
+
+ p_atomic_set(&bo->refcount, 1);
+ list_inithead(&bo->vma_list);
+
+ /* Determine size of bo. The fd-to-handle ioctl really should
+ * return the size, but it doesn't. If we have kernel 3.12 or
+ * later, we can lseek on the prime fd to get the size. Older
+ * kernels will just fail, in which case we fall back to the
+ * provided (estimated or guess size). */
+ ret = lseek(prime_fd, 0, SEEK_END);
+ if (ret != -1)
+ bo->size = ret;
+ else
+ bo->size = size;
+
+ bo->bufmgr = bufmgr;
+
+ bo->gem_handle = handle;
+ _mesa_hash_table_insert(bufmgr->handle_table, &bo->gem_handle, bo);
+
+ bo->name = "prime";
+ bo->reusable = false;
+
+ memclear(get_tiling);
+ get_tiling.handle = bo->gem_handle;
+ if (drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling))
+ goto err;
+
+ bo->tiling_mode = get_tiling.tiling_mode;
+ bo->swizzle_mode = get_tiling.swizzle_mode;
+ /* XXX stride is unknown */
out:
- pthread_mutex_unlock(&bufmgr->lock);
- return bo;
+ pthread_mutex_unlock(&bufmgr->lock);
+ return bo;
err:
- bo_free(bo);
- pthread_mutex_unlock(&bufmgr->lock);
- return NULL;
+ bo_free(bo);
+ pthread_mutex_unlock(&bufmgr->lock);
+ return NULL;
}
int
brw_bo_gem_export_to_prime(struct brw_bo *bo, int *prime_fd)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
- if (drmPrimeHandleToFD(bufmgr->fd, bo->gem_handle,
- DRM_CLOEXEC, prime_fd) != 0)
- return -errno;
+ if (drmPrimeHandleToFD(bufmgr->fd, bo->gem_handle,
+ DRM_CLOEXEC, prime_fd) != 0)
+ return -errno;
- bo->reusable = false;
+ bo->reusable = false;
- return 0;
+ return 0;
}
int
brw_bo_flink(struct brw_bo *bo, uint32_t *name)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
- if (!bo->global_name) {
- struct drm_gem_flink flink;
+ if (!bo->global_name) {
+ struct drm_gem_flink flink;
- memclear(flink);
- flink.handle = bo->gem_handle;
- if (drmIoctl(bufmgr->fd, DRM_IOCTL_GEM_FLINK, &flink))
- return -errno;
+ memclear(flink);
+ flink.handle = bo->gem_handle;
+ if (drmIoctl(bufmgr->fd, DRM_IOCTL_GEM_FLINK, &flink))
+ return -errno;
- pthread_mutex_lock(&bufmgr->lock);
- if (!bo->global_name) {
- bo->global_name = flink.name;
- bo->reusable = false;
+ pthread_mutex_lock(&bufmgr->lock);
+ if (!bo->global_name) {
+ bo->global_name = flink.name;
+ bo->reusable = false;
- _mesa_hash_table_insert(bufmgr->name_table,
- &bo->global_name, bo);
- }
- pthread_mutex_unlock(&bufmgr->lock);
- }
+ _mesa_hash_table_insert(bufmgr->name_table, &bo->global_name, bo);
+ }
+ pthread_mutex_unlock(&bufmgr->lock);
+ }
- *name = bo->global_name;
- return 0;
+ *name = bo->global_name;
+ return 0;
}
/**
@@ -1347,7 +1298,7 @@ brw_bo_flink(struct brw_bo *bo, uint32_t *name)
void
brw_bufmgr_enable_reuse(struct brw_bufmgr *bufmgr)
{
- bufmgr->bo_reuse = true;
+ bufmgr->bo_reuse = true;
}
/*
@@ -1357,226 +1308,221 @@ brw_bufmgr_enable_reuse(struct brw_bufmgr *bufmgr)
int
brw_bo_disable_reuse(struct brw_bo *bo)
{
- bo->reusable = false;
- return 0;
+ bo->reusable = false;
+ return 0;
}
int
brw_bo_is_reusable(struct brw_bo *bo)
{
- return bo->reusable;
+ return bo->reusable;
}
static void
add_bucket(struct brw_bufmgr *bufmgr, int size)
{
- unsigned int i = bufmgr->num_buckets;
+ unsigned int i = bufmgr->num_buckets;
- assert(i < ARRAY_SIZE(bufmgr->cache_bucket));
+ assert(i < ARRAY_SIZE(bufmgr->cache_bucket));
- list_inithead(&bufmgr->cache_bucket[i].head);
- bufmgr->cache_bucket[i].size = size;
- bufmgr->num_buckets++;
+ list_inithead(&bufmgr->cache_bucket[i].head);
+ bufmgr->cache_bucket[i].size = size;
+ bufmgr->num_buckets++;
}
static void
init_cache_buckets(struct brw_bufmgr *bufmgr)
{
- unsigned long size, cache_max_size = 64 * 1024 * 1024;
-
- /* OK, so power of two buckets was too wasteful of memory.
- * Give 3 other sizes between each power of two, to hopefully
- * cover things accurately enough. (The alternative is
- * probably to just go for exact matching of sizes, and assume
- * that for things like composited window resize the tiled
- * width/height alignment and rounding of sizes to pages will
- * get us useful cache hit rates anyway)
- */
- add_bucket(bufmgr, 4096);
- add_bucket(bufmgr, 4096 * 2);
- add_bucket(bufmgr, 4096 * 3);
-
- /* Initialize the linked lists for BO reuse cache. */
- for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
- add_bucket(bufmgr, size);
-
- add_bucket(bufmgr, size + size * 1 / 4);
- add_bucket(bufmgr, size + size * 2 / 4);
- add_bucket(bufmgr, size + size * 3 / 4);
- }
+ unsigned long size, cache_max_size = 64 * 1024 * 1024;
+
+ /* OK, so power of two buckets was too wasteful of memory.
+ * Give 3 other sizes between each power of two, to hopefully
+ * cover things accurately enough. (The alternative is
+ * probably to just go for exact matching of sizes, and assume
+ * that for things like composited window resize the tiled
+ * width/height alignment and rounding of sizes to pages will
+ * get us useful cache hit rates anyway)
+ */
+ add_bucket(bufmgr, 4096);
+ add_bucket(bufmgr, 4096 * 2);
+ add_bucket(bufmgr, 4096 * 3);
+
+ /* Initialize the linked lists for BO reuse cache. */
+ for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
+ add_bucket(bufmgr, size);
+
+ add_bucket(bufmgr, size + size * 1 / 4);
+ add_bucket(bufmgr, size + size * 2 / 4);
+ add_bucket(bufmgr, size + size * 3 / 4);
+ }
}
void
brw_bufmgr_gem_set_vma_cache_size(struct brw_bufmgr *bufmgr, int limit)
{
- bufmgr->vma_max = limit;
+ bufmgr->vma_max = limit;
- bo_purge_vma_cache(bufmgr);
+ bo_purge_vma_cache(bufmgr);
}
uint32_t
brw_create_hw_context(struct brw_bufmgr *bufmgr)
{
- struct drm_i915_gem_context_create create;
- int ret;
-
- memclear(create);
- ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE, &create);
- if (ret != 0) {
- DBG("DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: %s\n",
- strerror(errno));
- return 0;
- }
-
- return create.ctx_id;
+ struct drm_i915_gem_context_create create;
+ int ret;
+
+ memclear(create);
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE, &create);
+ if (ret != 0) {
+ DBG("DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: %s\n", strerror(errno));
+ return 0;
+ }
+
+ return create.ctx_id;
}
void
brw_destroy_hw_context(struct brw_bufmgr *bufmgr, uint32_t ctx_id)
{
- struct drm_i915_gem_context_destroy d = { .ctx_id = ctx_id };
+ struct drm_i915_gem_context_destroy d = {.ctx_id = ctx_id };
- if (ctx_id != 0 &&
- drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_DESTROY, &d) != 0) {
- fprintf(stderr, "DRM_IOCTL_I915_GEM_CONTEXT_DESTROY failed: %s\n",
- strerror(errno));
- }
+ if (ctx_id != 0 &&
+ drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_DESTROY, &d) != 0) {
+ fprintf(stderr, "DRM_IOCTL_I915_GEM_CONTEXT_DESTROY failed: %s\n",
+ strerror(errno));
+ }
}
int
brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset, uint64_t *result)
{
- struct drm_i915_reg_read reg_read;
- int ret;
+ struct drm_i915_reg_read reg_read;
+ int ret;
- memclear(reg_read);
- reg_read.offset = offset;
+ memclear(reg_read);
+ reg_read.offset = offset;
- ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_REG_READ, ®_read);
+ ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_REG_READ, ®_read);
- *result = reg_read.val;
- return ret;
+ *result = reg_read.val;
+ return ret;
}
-void *brw_bo_map__gtt(struct brw_bo *bo)
+void *
+brw_bo_map__gtt(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
-
- if (bo->gtt_virtual)
- return bo->gtt_virtual;
-
- pthread_mutex_lock(&bufmgr->lock);
- if (bo->gtt_virtual == NULL) {
- struct drm_i915_gem_mmap_gtt mmap_arg;
- void *ptr;
-
- DBG("bo_map_gtt: mmap %d (%s), map_count=%d\n",
- bo->gem_handle, bo->name, bo->map_count);
-
- if (bo->map_count++ == 0)
- bo_open_vma(bufmgr, bo);
-
- memclear(mmap_arg);
- mmap_arg.handle = bo->gem_handle;
-
- /* Get the fake offset back... */
- ptr = MAP_FAILED;
- if (drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_MMAP_GTT,
- &mmap_arg) == 0) {
- /* and mmap it */
- ptr = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
- MAP_SHARED, bufmgr->fd,
- mmap_arg.offset);
- }
- if (ptr == MAP_FAILED) {
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- ptr = NULL;
- }
-
- bo->gtt_virtual = ptr;
- }
- pthread_mutex_unlock(&bufmgr->lock);
-
- return bo->gtt_virtual;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+
+ if (bo->gtt_virtual)
+ return bo->gtt_virtual;
+
+ pthread_mutex_lock(&bufmgr->lock);
+ if (bo->gtt_virtual == NULL) {
+ struct drm_i915_gem_mmap_gtt mmap_arg;
+ void *ptr;
+
+ DBG("bo_map_gtt: mmap %d (%s), map_count=%d\n",
+ bo->gem_handle, bo->name, bo->map_count);
+
+ if (bo->map_count++ == 0)
+ bo_open_vma(bufmgr, bo);
+
+ memclear(mmap_arg);
+ mmap_arg.handle = bo->gem_handle;
+
+ /* Get the fake offset back... */
+ ptr = MAP_FAILED;
+ if (drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg) == 0) {
+ /* and mmap it */
+ ptr = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, bufmgr->fd, mmap_arg.offset);
+ }
+ if (ptr == MAP_FAILED) {
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ ptr = NULL;
+ }
+
+ bo->gtt_virtual = ptr;
+ }
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return bo->gtt_virtual;
}
-void *brw_bo_map__cpu(struct brw_bo *bo)
+void *
+brw_bo_map__cpu(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
-
- if (bo->mem_virtual)
- return bo->mem_virtual;
-
- pthread_mutex_lock(&bufmgr->lock);
- if (!bo->mem_virtual) {
- struct drm_i915_gem_mmap mmap_arg;
-
- if (bo->map_count++ == 0)
- bo_open_vma(bufmgr, bo);
-
- DBG("bo_map: %d (%s), map_count=%d\n",
- bo->gem_handle, bo->name, bo->map_count);
-
- memclear(mmap_arg);
- mmap_arg.handle = bo->gem_handle;
- mmap_arg.size = bo->size;
- if (drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_MMAP,
- &mmap_arg)) {
- DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
- __FILE__, __LINE__, bo->gem_handle,
- bo->name, strerror(errno));
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- } else {
- VG(VALGRIND_MALLOCLIKE_BLOCK(mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
- bo->mem_virtual = (void *)(uintptr_t) mmap_arg.addr_ptr;
- }
- }
- pthread_mutex_unlock(&bufmgr->lock);
-
- return bo->mem_virtual;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+
+ if (bo->mem_virtual)
+ return bo->mem_virtual;
+
+ pthread_mutex_lock(&bufmgr->lock);
+ if (!bo->mem_virtual) {
+ struct drm_i915_gem_mmap mmap_arg;
+
+ if (bo->map_count++ == 0)
+ bo_open_vma(bufmgr, bo);
+
+ DBG("bo_map: %d (%s), map_count=%d\n",
+ bo->gem_handle, bo->name, bo->map_count);
+
+ memclear(mmap_arg);
+ mmap_arg.handle = bo->gem_handle;
+ mmap_arg.size = bo->size;
+ if (drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
+ DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ } else {
+ VG(VALGRIND_MALLOCLIKE_BLOCK
+ (mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
+ bo->mem_virtual = (void *) (uintptr_t) mmap_arg.addr_ptr;
+ }
+ }
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return bo->mem_virtual;
}
-void *brw_bo_map__wc(struct brw_bo *bo)
+void *
+brw_bo_map__wc(struct brw_bo *bo)
{
- struct brw_bufmgr *bufmgr = bo->bufmgr;
-
- if (bo->wc_virtual)
- return bo->wc_virtual;
-
- pthread_mutex_lock(&bufmgr->lock);
- if (!bo->wc_virtual) {
- struct drm_i915_gem_mmap mmap_arg;
-
- if (bo->map_count++ == 0)
- bo_open_vma(bufmgr, bo);
-
- DBG("bo_map: %d (%s), map_count=%d\n",
- bo->gem_handle, bo->name, bo->map_count);
-
- memclear(mmap_arg);
- mmap_arg.handle = bo->gem_handle;
- mmap_arg.size = bo->size;
- mmap_arg.flags = I915_MMAP_WC;
- if (drmIoctl(bufmgr->fd,
- DRM_IOCTL_I915_GEM_MMAP,
- &mmap_arg)) {
- DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
- __FILE__, __LINE__, bo->gem_handle,
- bo->name, strerror(errno));
- if (--bo->map_count == 0)
- bo_close_vma(bufmgr, bo);
- } else {
- VG(VALGRIND_MALLOCLIKE_BLOCK(mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
- bo->wc_virtual = (void *)(uintptr_t) mmap_arg.addr_ptr;
- }
- }
- pthread_mutex_unlock(&bufmgr->lock);
-
- return bo->wc_virtual;
+ struct brw_bufmgr *bufmgr = bo->bufmgr;
+
+ if (bo->wc_virtual)
+ return bo->wc_virtual;
+
+ pthread_mutex_lock(&bufmgr->lock);
+ if (!bo->wc_virtual) {
+ struct drm_i915_gem_mmap mmap_arg;
+
+ if (bo->map_count++ == 0)
+ bo_open_vma(bufmgr, bo);
+
+ DBG("bo_map: %d (%s), map_count=%d\n",
+ bo->gem_handle, bo->name, bo->map_count);
+
+ memclear(mmap_arg);
+ mmap_arg.handle = bo->gem_handle;
+ mmap_arg.size = bo->size;
+ mmap_arg.flags = I915_MMAP_WC;
+ if (drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
+ DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
+ __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
+ if (--bo->map_count == 0)
+ bo_close_vma(bufmgr, bo);
+ } else {
+ VG(VALGRIND_MALLOCLIKE_BLOCK
+ (mmap_arg.addr_ptr, mmap_arg.size, 0, 1));
+ bo->wc_virtual = (void *) (uintptr_t) mmap_arg.addr_ptr;
+ }
+ }
+ pthread_mutex_unlock(&bufmgr->lock);
+
+ return bo->wc_virtual;
}
/**
@@ -1588,30 +1534,30 @@ void *brw_bo_map__wc(struct brw_bo *bo)
struct brw_bufmgr *
brw_bufmgr_init(struct gen_device_info *devinfo, int fd, int batch_size)
{
- struct brw_bufmgr *bufmgr;
+ struct brw_bufmgr *bufmgr;
- bufmgr = calloc(1, sizeof(*bufmgr));
- if (bufmgr == NULL)
- return NULL;
+ bufmgr = calloc(1, sizeof(*bufmgr));
+ if (bufmgr == NULL)
+ return NULL;
- bufmgr->fd = fd;
+ bufmgr->fd = fd;
- if (pthread_mutex_init(&bufmgr->lock, NULL) != 0) {
- free(bufmgr);
- return NULL;
- }
+ if (pthread_mutex_init(&bufmgr->lock, NULL) != 0) {
+ free(bufmgr);
+ return NULL;
+ }
- bufmgr->has_llc = devinfo->has_llc;
+ bufmgr->has_llc = devinfo->has_llc;
- init_cache_buckets(bufmgr);
+ init_cache_buckets(bufmgr);
- list_inithead(&bufmgr->vma_cache);
- bufmgr->vma_max = -1; /* unlimited by default */
+ list_inithead(&bufmgr->vma_cache);
+ bufmgr->vma_max = -1; /* unlimited by default */
- bufmgr->name_table =
- _mesa_hash_table_create(NULL, key_hash_uint, key_uint_equal);
- bufmgr->handle_table =
- _mesa_hash_table_create(NULL, key_hash_uint, key_uint_equal);
+ bufmgr->name_table =
+ _mesa_hash_table_create(NULL, key_hash_uint, key_uint_equal);
+ bufmgr->handle_table =
+ _mesa_hash_table_create(NULL, key_hash_uint, key_uint_equal);
- return bufmgr;
+ return bufmgr;
}
--
2.12.1
More information about the mesa-dev
mailing list