diff options
| author | r80085 <thomas.peng@freescale.com> | 2010-07-19 18:00:16 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2010-12-17 12:10:52 -0500 |
| commit | d93d51e0de7f8162e7fa4185872cad8ac11ae530 (patch) | |
| tree | 0249648af8a697fe044c81589eee0f6dcde90bc7 /drivers/mxc/amd-gpu/include/gsl_ringbuffer.h | |
| parent | ee7ed985bb53ccba77007393c8be2d14c8a2cdf2 (diff) | |
ENGR00125256 Integrate AMD Rc16/EA VG/GL fix to GPU kernel module
Fix the VG/GL issue in GPU kernel module when running VG/GL at the same time
Signed-off-by: Gene Chouiniere <Gene.Chouiniere@amd.com>
Signed-off-by: r80085 <thomas.peng@freescale.com>
Acked-by: Rob Herring <r.herring@freescale.com>
Diffstat (limited to 'drivers/mxc/amd-gpu/include/gsl_ringbuffer.h')
| -rw-r--r-- | drivers/mxc/amd-gpu/include/gsl_ringbuffer.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/mxc/amd-gpu/include/gsl_ringbuffer.h b/drivers/mxc/amd-gpu/include/gsl_ringbuffer.h index d4bdf34c0bae..6081c396f6e4 100644 --- a/drivers/mxc/amd-gpu/include/gsl_ringbuffer.h +++ b/drivers/mxc/amd-gpu/include/gsl_ringbuffer.h @@ -137,8 +137,6 @@ typedef struct _gsl_ringbuffer_t { gsl_device_t *device; gsl_flags_t flags; - oshandle_t mutex; - gsl_memdesc_t buffer_desc; // allocated memory descriptor gsl_memdesc_t memptrs_desc; @@ -165,19 +163,6 @@ typedef struct _gsl_ringbuffer_t { // macros ////////////////////////////////////////////////////////////////////////////// -#ifdef GSL_LOCKING_FINEGRAIN -#define GSL_RB_MUTEX_CREATE() rb->mutex = kos_mutex_create("gsl_ringbuffer"); \ - if (!rb->mutex) {return (GSL_FAILURE);} -#define GSL_RB_MUTEX_LOCK() kos_mutex_lock(rb->mutex) -#define GSL_RB_MUTEX_UNLOCK() kos_mutex_unlock(rb->mutex) -#define GSL_RB_MUTEX_FREE() kos_mutex_free(rb->mutex); rb->mutex = 0; -#else -#define GSL_RB_MUTEX_CREATE() -#define GSL_RB_MUTEX_LOCK() -#define GSL_RB_MUTEX_UNLOCK() -#define GSL_RB_MUTEX_FREE() -#endif - // ---------- // ring write // ---------- @@ -206,10 +191,10 @@ typedef struct _gsl_ringbuffer_t { // -------- #ifdef GSL_RB_USE_MEM_RPTR #define GSL_RB_CNTL_NO_UPDATE 0x0 // enable -#define GSL_RB_GET_READPTR(rb, data) kgsl_sharedmem_read(&(rb)->memptrs_desc, (data), GSL_RB_MEMPTRS_RPTR_OFFSET, 4, false) +#define GSL_RB_GET_READPTR(rb, data) kgsl_sharedmem_read0(&(rb)->memptrs_desc, (data), GSL_RB_MEMPTRS_RPTR_OFFSET, 4, false) #else #define GSL_RB_CNTL_NO_UPDATE 0x1 // disable -#define GSL_RB_GET_READPTR(rb, data) kgsl_device_regread((rb)->device->id, mmCP_RB_RPTR,(data)) +#define GSL_RB_GET_READPTR(rb, data) (rb)->device->fbtl.device_regread((rb)->device, mmCP_RB_RPTR,(data)) #endif // GSL_RB_USE_MEMRPTR // ------------ |