5045 use atomic_{inc,dec}_* instead of atomic_add_*

          --- old/usr/src/uts/common/io/drm/drm_atomic.h
          +++ new/usr/src/uts/common/io/drm/drm_atomic.h

   1    1  /*
   2    2   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   3    3   * Use is subject to license terms.
   4    4   */
   5    5  /*
   6    6   * \file drm_atomic.h
   7    7   * Atomic operations used in the DRM which may or may not be provided by the OS.
   8    8   *
   9    9   * \author Eric Anholt <anholt@FreeBSD.org>
  10   10   */
  11   11  
  12   12  /*
  13   13   * Copyright 2004 Eric Anholt
  14   14   * Copyright (c) 2009, Intel Corporation.
  15   15   * All Rights Reserved.
  16   16   *
  17   17   * Permission is hereby granted, free of charge, to any person obtaining a
  18   18   * copy of this software and associated documentation files (the "Software"),
  19   19   * to deal in the Software without restriction, including without limitation
  20   20   * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  21   21   * and/or sell copies of the Software, and to permit persons to whom the
  22   22   * Software is furnished to do so, subject to the following conditions:
  23   23   *
  24   24   * The above copyright notice and this permission notice (including the next
  25   25   * paragraph) shall be included in all copies or substantial portions of the
  26   26   * Software.
  27   27   *
  28   28   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  29   29   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  30   30   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  31   31   * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
  32   32   * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  33   33   * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  34   34   * OTHER DEALINGS IN THE SOFTWARE.
  35   35   */
  36   36  
  37   37  /* Many of these implementations are rather fake, but good enough. */
  38   38  
  39   39  
  40   40  
  41   41  #ifndef _SYS_DRM_ATOMIC_H_
  42   42  #define _SYS_DRM_ATOMIC_H_
  43   43  
  44   44  #ifdef  __cplusplus
  45   45  extern "C" {
  46   46  #endif
  47   47  

  48   48  #include <sys/atomic.h>
  49   49  
  50   50  #ifdef __LINT__
  51   51  #undef inline
  52   52  #define inline
  53   53  #endif
  54   54  typedef uint32_t        atomic_t;
  55   55  
  56   56  #define atomic_set(p, v)        (*(p) = (v))
  57   57  #define atomic_read(p)          (*(p))
  58      -#define atomic_inc(p)           atomic_add_int(p, 1)
       58 +#define atomic_inc(p)           atomic_inc_uint(p)
  59   59  #define atomic_dec(p)           atomic_dec_uint(p)
  60   60  #define atomic_add(n, p)        atomic_add_int(p, n)
  61   61  #define atomic_sub(n, p)        atomic_add_int(p, -n)
  62   62  #define atomic_set_int(p, bits) atomic_or_uint(p, bits)
  63   63  #define atomic_clear_int(p, bits)       atomic_and_uint(p, ~(bits))
  64   64  #define atomic_cmpset_int(p, c, n) \
  65   65          ((c == atomic_cas_uint(p, c, n)) ? 1 : 0)
  66   66  
  67   67  #define set_bit(b, p) \
  68   68          atomic_set_int(((volatile uint_t *)(void *)p) + (b >> 5), \

  69   69          1 << (b & 0x1f))
  70   70  
  71   71  #define clear_bit(b, p) \
  72   72          atomic_clear_int(((volatile uint_t *)(void *)p) + (b >> 5), \
  73   73          1 << (b & 0x1f))
  74   74  
  75   75  #define test_bit(b, p) \
  76   76          (((volatile uint_t *)(void *)p)[b >> 5] & (1 << (b & 0x1f)))
  77   77  
  78   78  /*
  79   79   * Note: this routine doesn't return old value. It return
  80   80   * 0 when succeeds, or -1 when fails.
  81   81   */
  82   82  #ifdef _LP64
  83   83  #define test_and_set_bit(b, p) \
  84   84          atomic_set_long_excl(((ulong_t *)(void *)p) + (b >> 6), (b & 0x3f))
  85   85  #else
  86   86  #define test_and_set_bit(b, p) \
  87   87          atomic_set_long_excl(((ulong_t *)(void *)p) + (b >> 5), (b & 0x1f))
  88   88  #endif
  89   89  
  90   90  #ifdef  __cplusplus
  91   91  }
  92   92  #endif
  93   93  
  94   94  #endif /* _SYS_DRM_ATOMIC_H_ */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX