From 7c64096b2d9bd131a0ece0a5e6f2696b06158380 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 21 Mar 2017 14:54:07 -0700 Subject: [PATCH] i965/drm: Port to Mesa's atomic header. Drop xf86atomic.h in favor of Mesa's util/u_atomic.h. We replace the atomic_t wrapper struct with a bare integer, switch to the 'p_atomic' naming conventions, and move over the one extra helper. Reviewed-by: Chris Wilson Acked-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/Makefile.sources | 3 +- src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 40 ++++--- src/mesa/drivers/dri/i965/xf86atomic.h | 113 ------------------- 3 files changed, 26 insertions(+), 130 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/xf86atomic.h diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index fe20116b9be..9ae764fed58 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -165,8 +165,7 @@ i965_FILES = \ intel_upload.c \ libdrm_lists.h \ libdrm_macros.h \ - uthash.h \ - xf86atomic.h + uthash.h i965_gen6_FILES = \ genX_blorp_exec.c diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c index 4f9d6be7ac8..c67f813bdf5 100644 --- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c +++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c @@ -39,7 +39,7 @@ #endif #include -#include +#include #include #include #include @@ -84,6 +84,16 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define MAX2(A, B) ((A) > (B) ? (A) : (B)) +static inline int +atomic_add_unless(int *v, int add, int unless) +{ + int c, old; + c = p_atomic_read(v); + while (c != unless && (old = p_atomic_cmpxchg(v, c, c + add)) != c) + c = old; + return c == unless; +} + /** * upper_32_bits - return bits 32-63 of a number * @n: the number we're accessing @@ -110,7 +120,7 @@ struct drm_bacon_gem_bo_bucket { typedef struct _drm_bacon_bufmgr_gem { drm_bacon_bufmgr bufmgr; - atomic_t refcount; + int refcount; int fd; @@ -169,7 +179,7 @@ typedef struct _drm_bacon_reloc_target_info { struct _drm_bacon_bo_gem { drm_bacon_bo bo; - atomic_t refcount; + int refcount; uint32_t gem_handle; const char *name; @@ -472,7 +482,7 @@ drm_bacon_gem_bo_reference(drm_bacon_bo *bo) { drm_bacon_bo_gem *bo_gem = (drm_bacon_bo_gem *) bo; - atomic_inc(&bo_gem->refcount); + p_atomic_inc(&bo_gem->refcount); } /** @@ -834,7 +844,7 @@ retry: } bo_gem->name = name; - atomic_set(&bo_gem->refcount, 1); + p_atomic_set(&bo_gem->refcount, 1); bo_gem->validate_index = -1; bo_gem->reloc_tree_fences = 0; bo_gem->used_as_reloc_target = false; @@ -954,7 +964,7 @@ drm_bacon_gem_bo_alloc_userptr(drm_bacon_bufmgr *bufmgr, if (!bo_gem) return NULL; - atomic_set(&bo_gem->refcount, 1); + p_atomic_set(&bo_gem->refcount, 1); DRMINITLISTHEAD(&bo_gem->vma_list); bo_gem->bo.size = size; @@ -1131,7 +1141,7 @@ drm_bacon_bo_gem_create_from_name(drm_bacon_bufmgr *bufmgr, if (!bo_gem) goto out; - atomic_set(&bo_gem->refcount, 1); + p_atomic_set(&bo_gem->refcount, 1); DRMINITLISTHEAD(&bo_gem->vma_list); bo_gem->bo.size = open_arg.size; @@ -1402,8 +1412,8 @@ static void drm_bacon_gem_bo_unreference_locked_timed(drm_bacon_bo *bo, { drm_bacon_bo_gem *bo_gem = (drm_bacon_bo_gem *) bo; - assert(atomic_read(&bo_gem->refcount) > 0); - if (atomic_dec_and_test(&bo_gem->refcount)) + assert(p_atomic_read(&bo_gem->refcount) > 0); + if (p_atomic_dec_zero(&bo_gem->refcount)) drm_bacon_gem_bo_unreference_final(bo, time); } @@ -1411,7 +1421,7 @@ static void drm_bacon_gem_bo_unreference(drm_bacon_bo *bo) { drm_bacon_bo_gem *bo_gem = (drm_bacon_bo_gem *) bo; - assert(atomic_read(&bo_gem->refcount) > 0); + assert(p_atomic_read(&bo_gem->refcount) > 0); if (atomic_add_unless(&bo_gem->refcount, -1, 1)) { drm_bacon_bufmgr_gem *bufmgr_gem = @@ -1422,7 +1432,7 @@ static void drm_bacon_gem_bo_unreference(drm_bacon_bo *bo) pthread_mutex_lock(&bufmgr_gem->lock); - if (atomic_dec_and_test(&bo_gem->refcount)) { + if (p_atomic_dec_zero(&bo_gem->refcount)) { drm_bacon_gem_bo_unreference_final(bo, time.tv_sec); drm_bacon_gem_cleanup_bo_cache(bufmgr_gem, time.tv_sec); } @@ -2657,7 +2667,7 @@ drm_bacon_bo_gem_create_from_prime(drm_bacon_bufmgr *bufmgr, int prime_fd, int s if (!bo_gem) goto out; - atomic_set(&bo_gem->refcount, 1); + p_atomic_set(&bo_gem->refcount, 1); DRMINITLISTHEAD(&bo_gem->vma_list); /* Determine size of bo. The fd-to-handle ioctl really should @@ -3368,7 +3378,7 @@ drm_bacon_bufmgr_gem_find(int fd) DRMLISTFOREACHENTRY(bufmgr_gem, &bufmgr_list, managers) { if (bufmgr_gem->fd == fd) { - atomic_inc(&bufmgr_gem->refcount); + p_atomic_inc(&bufmgr_gem->refcount); return bufmgr_gem; } } @@ -3384,7 +3394,7 @@ drm_bacon_bufmgr_gem_unref(drm_bacon_bufmgr *bufmgr) if (atomic_add_unless(&bufmgr_gem->refcount, -1, 1)) { pthread_mutex_lock(&bufmgr_list_mutex); - if (atomic_dec_and_test(&bufmgr_gem->refcount)) { + if (p_atomic_dec_zero(&bufmgr_gem->refcount)) { DRMLISTDEL(&bufmgr_gem->managers); drm_bacon_bufmgr_gem_destroy(bufmgr); } @@ -3554,7 +3564,7 @@ drm_bacon_bufmgr_gem_init(int fd, int batch_size) goto exit; bufmgr_gem->fd = fd; - atomic_set(&bufmgr_gem->refcount, 1); + p_atomic_set(&bufmgr_gem->refcount, 1); if (pthread_mutex_init(&bufmgr_gem->lock, NULL) != 0) { free(bufmgr_gem); diff --git a/src/mesa/drivers/dri/i965/xf86atomic.h b/src/mesa/drivers/dri/i965/xf86atomic.h deleted file mode 100644 index a0e39092d12..00000000000 --- a/src/mesa/drivers/dri/i965/xf86atomic.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright © 2009 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Chris Wilson - * - */ - -/** - * @file xf86atomics.h - * - * Private definitions for atomic operations - */ - -#ifndef LIBDRM_ATOMICS_H -#define LIBDRM_ATOMICS_H - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#define HAS_ATOMIC_OPS 1 - -typedef struct { - int atomic; -} atomic_t; - -# define atomic_read(x) ((x)->atomic) -# define atomic_set(x, val) ((x)->atomic = (val)) -# define atomic_inc(x) ((void) __sync_fetch_and_add (&(x)->atomic, 1)) -# define atomic_inc_return(x) (__sync_add_and_fetch (&(x)->atomic, 1)) -# define atomic_dec_and_test(x) (__sync_add_and_fetch (&(x)->atomic, -1) == 0) -# define atomic_add(x, v) ((void) __sync_add_and_fetch(&(x)->atomic, (v))) -# define atomic_dec(x, v) ((void) __sync_sub_and_fetch(&(x)->atomic, (v))) -# define atomic_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (&(x)->atomic, oldv, newv) - -#endif - -#if HAVE_LIB_ATOMIC_OPS -#include - -#define HAS_ATOMIC_OPS 1 - -typedef struct { - AO_t atomic; -} atomic_t; - -# define atomic_read(x) AO_load_full(&(x)->atomic) -# define atomic_set(x, val) AO_store_full(&(x)->atomic, (val)) -# define atomic_inc(x) ((void) AO_fetch_and_add1_full(&(x)->atomic)) -# define atomic_inc_return(x) (AO_fetch_and_add1_full(&(x)->atomic) + 1) -# define atomic_add(x, v) ((void) AO_fetch_and_add_full(&(x)->atomic, (v))) -# define atomic_dec(x, v) ((void) AO_fetch_and_add_full(&(x)->atomic, -(v))) -# define atomic_dec_and_test(x) (AO_fetch_and_sub1_full(&(x)->atomic) == 1) -# define atomic_cmpxchg(x, oldv, newv) AO_compare_and_swap_full(&(x)->atomic, oldv, newv) - -#endif - -#if (defined(__sun) || defined(__NetBSD__)) && !defined(HAS_ATOMIC_OPS) /* Solaris & OpenSolaris & NetBSD */ - -#include -#define HAS_ATOMIC_OPS 1 - -#if defined(__NetBSD__) -#define LIBDRM_ATOMIC_TYPE int -#else -#define LIBDRM_ATOMIC_TYPE uint_t -#endif - -typedef struct { LIBDRM_ATOMIC_TYPE atomic; } atomic_t; - -# define atomic_read(x) (int) ((x)->atomic) -# define atomic_set(x, val) ((x)->atomic = (LIBDRM_ATOMIC_TYPE)(val)) -# define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) -# define atomic_inc_return(x) (atomic_inc_uint_nv(&(x)->atomic)) -# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) -# define atomic_add(x, v) (atomic_add_int(&(x)->atomic, (v))) -# define atomic_dec(x, v) (atomic_add_int(&(x)->atomic, -(v))) -# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv) - -#endif - -#if ! HAS_ATOMIC_OPS -#error libdrm requires atomic operations, please define them for your CPU/compiler. -#endif - -static inline int atomic_add_unless(atomic_t *v, int add, int unless) -{ - int c, old; - c = atomic_read(v); - while (c != unless && (old = atomic_cmpxchg(v, c, c + add)) != c) - c = old; - return c == unless; -} -- 2.30.2