From 791c0e2daf69cf0dfd132b021f08252f0ad9324c Mon Sep 17 00:00:00 2001 From: Roman Marchenko Date: Fri, 12 Feb 2016 17:22:15 +0200 Subject: [PATCH 01/16] fix a leak of file descriptors Change-Id: I4b1c4fe3119d720c13e158e5aa9cc3d79d760124 Signed-off-by: Roman Marchenko --- src/tbm_bufmgr_sprd.c | 1 + 1 file changed, 1 insertion(+) mode change 100755 => 100644 src/tbm_bufmgr_sprd.c diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c old mode 100755 new mode 100644 index 670b58c..0b06f8b --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -773,6 +773,7 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) bo_sprd->fd = bufmgr_sprd->fd; bo_sprd->gem = gem; + bo_sprd->dmabuf = key; bo_sprd->size = real_size; bo_sprd->flags_sprd = info.flags; bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); -- 2.7.4 From f67d4e0f6b894cfb454ed98af8c2b85723cd629c Mon Sep 17 00:00:00 2001 From: Roman Marchenko Date: Tue, 16 Feb 2016 01:51:56 -0800 Subject: [PATCH 02/16] Revert "fix a leak of file descriptors" This reverts commit 791c0e2daf69cf0dfd132b021f08252f0ad9324c. The user of libtbm have to control state of "fd" by himself. So libtbm shouldn't save fd which received by tbm_bo_import_fd() Change-Id: Ic62d6a6363762691bfd06bab913949e907ee660a --- src/tbm_bufmgr_sprd.c | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 src/tbm_bufmgr_sprd.c diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c old mode 100644 new mode 100755 index 0b06f8b..670b58c --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -773,7 +773,6 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) bo_sprd->fd = bufmgr_sprd->fd; bo_sprd->gem = gem; - bo_sprd->dmabuf = key; bo_sprd->size = real_size; bo_sprd->flags_sprd = info.flags; bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); -- 2.7.4 From 215b577186bd1170e47904ab83260d41d6ecf1c5 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Fri, 26 Feb 2016 13:37:17 +0900 Subject: [PATCH 03/16] User 2.0 backend Change-Id: Ic580bb54df87637a2dc3bfd06bab66059a7cd4a5 --- src/Makefile.am | 3 +- src/tbm_bufmgr_sprd.c | 950 ++++++++++++++++++++++++-------------------------- src/tbm_bufmgr_tgl.h | 70 ++++ src/tbm_wayland.c | 279 --------------- src/tbm_wayland.h | 38 -- 5 files changed, 518 insertions(+), 822 deletions(-) create mode 100644 src/tbm_bufmgr_tgl.h delete mode 100644 src/tbm_wayland.c delete mode 100644 src/tbm_wayland.h diff --git a/src/Makefile.am b/src/Makefile.am index 7296dba..ebe5b35 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,5 +9,4 @@ libtbm_sprd_ladir = /${bufmgr_dir} libtbm_sprd_la_LIBADD = @LIBTBM_SPRD_LIBS@ libtbm_sprd_la_SOURCES = \ - tbm_bufmgr_sprd.c \ - tbm_wayland.c + tbm_bufmgr_sprd.c diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 670b58c..21aee52 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -49,17 +49,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include "tbm_wayland.h" +#include #define DEBUG +#include "tbm_bufmgr_tgl.h" //#define USE_CONTIG_ONLY #define USE_DMAIMPORT #define TBM_COLOR_FORMAT_COUNT 8 - - #ifdef DEBUG #define LOG_TAG "TBM_BACKEND" #include @@ -155,12 +154,39 @@ struct dma_buf_fence { #define DMABUF_IOCTL_GET_FENCE DMABUF_IOWR(0x01, struct dma_buf_fence) #define DMABUF_IOCTL_PUT_FENCE DMABUF_IOWR(0x02, struct dma_buf_fence) +/* tgl key values */ +#define GLOBAL_KEY ((unsigned int)(-1)) +/* TBM_CACHE */ +#define TBM_SPRD_CACHE_INV 0x01 /**< cache invalidate */ +#define TBM_SPRD_CACHE_CLN 0x02 /**< cache clean */ +#define TBM_SPRD_CACHE_ALL 0x10 /**< cache all */ +#define TBM_SPRD_CACHE_FLUSH (TBM_SPRD_CACHE_INV|TBM_SPRD_CACHE_CLN) /**< cache flush */ +#define TBM_SPRD_CACHE_FLUSH_ALL (TBM_SPRD_CACHE_FLUSH|TBM_SPRD_CACHE_ALL) /**< cache flush all */ + +enum { + DEVICE_NONE = 0, + DEVICE_CA, /* cache aware device */ + DEVICE_CO /* cache oblivious device */ +}; + +typedef union _tbm_bo_cache_state tbm_bo_cache_state; + +union _tbm_bo_cache_state { + unsigned int val; + struct { + unsigned int cntFlush:16; /*Flush all index for sync */ + unsigned int isCached:1; + unsigned int isDirtied:2; + } data; +}; + typedef struct _tbm_bufmgr_sprd *tbm_bufmgr_sprd; typedef struct _tbm_bo_sprd *tbm_bo_sprd; typedef struct _sprd_private { int ref_count; + struct _tbm_bo_sprd *bo_priv; } PrivGem; /* tbm buffor object for sprd */ @@ -187,6 +213,9 @@ struct _tbm_bo_sprd struct dma_buf_fence dma_fence[DMA_FENCE_LIST_MAX]; int device; int opt; + + tbm_bo_cache_state cache_state; + unsigned int map_cnt; }; /* tbm bufmgr private for sprd */ @@ -197,7 +226,9 @@ struct _tbm_bufmgr_sprd int use_dma_fence; - int fd_owner; + int tgl_fd; + + void *bind_display; }; char *STR_DEVICE[]= @@ -227,6 +258,276 @@ uint32_t tbm_sprd_color_format_list[TBM_COLOR_FORMAT_COUNT] = { TBM_FORMAT_RGBA8 TBM_FORMAT_YUV420, TBM_FORMAT_YVU420 }; +static inline int _tgl_init(int fd, unsigned int key) +{ + struct tgl_attribute attr; + int err; + + attr.key = key; + attr.timeout_ms = 1000; + + err = ioctl(fd, TGL_IOC_INIT_LOCK, &attr); + if (err) { + TBM_SPRD_LOG("[libtbm:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + return 0; + } + + return 1; +} + +static inline int _tgl_destroy(int fd, unsigned int key) +{ + int err; + err = ioctl(fd, TGL_IOC_DESTROY_LOCK, key); + if (err) { + TBM_SPRD_LOG("[libtbm:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + return 0; + } + + return 1; +} + +static inline int _tgl_set_data(int fd, unsigned int key, unsigned int val) +{ + int err; + struct tgl_user_data arg; + + arg.key = key; + arg.data1 = val; + err = ioctl(fd, TGL_IOC_SET_DATA, &arg); + if (err) { + TBM_SPRD_LOG("[libtbm:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + return 0; + } + + return 1; +} + +static inline unsigned int _tgl_get_data(int fd, unsigned int key) +{ + int err; + struct tgl_user_data arg = { 0, }; + + arg.key = key; + err = ioctl(fd, TGL_IOC_GET_DATA, &arg); + if (err) { + TBM_SPRD_LOG("[libtbm:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + return 0; + } + + return arg.data1; +} + +static int +_sprd_bo_cache_flush (tbm_bo bo, int flags) +{ + tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + + /* cache flush is managed by kernel side when using dma-fence. */ + if (bufmgr_sprd->use_dma_fence) + return 1; + + SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + + tbm_bo_sprd bo_sprd; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + +#ifdef USE_CACHE + struct drm_sprd_gem_cache_op cache_op = {0, }; + int ret; + + /* if bo_sprd is null, do cache_flush_all */ + if(bo_sprd) + { + cache_op.flags = 0; + cache_op.usr_addr = (uint64_t)((uint32_t)bo_sprd->pBase); + cache_op.size = bo_sprd->size; + } + else + { + flags = TBM_SPRD_CACHE_FLUSH_ALL; + cache_op.flags = 0; + cache_op.usr_addr = 0; + cache_op.size = 0; + } + + if (flags & TBM_SPRD_CACHE_INV) + { + if(flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_CACHE_INV_ALL; + else + cache_op.flags |= SPRD_DRM_CACHE_INV_RANGE; + } + + if (flags & TBM_SPRD_CACHE_CLN) + { + if(flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_CACHE_CLN_ALL; + else + cache_op.flags |= SPRD_DRM_CACHE_CLN_RANGE; + } + + if(flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_ALL_CACHES_CORES; + + ret = drmCommandWriteRead (bufmgr_sprd->fd, DRM_SPRD_GEM_CACHE_OP, &cache_op, sizeof(cache_op)); + if (ret) + { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fail to flush the cache.\n", + getpid(), __FUNCTION__, __LINE__); + return 0; + } +#endif + + return 1; +} + +static int +_bo_init_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd) +{ + tbm_bo_cache_state cache_state; + + SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + + _tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name); + + cache_state.data.isDirtied = DEVICE_NONE; + cache_state.data.isCached = 0; + cache_state.data.cntFlush = 0; + + _tgl_set_data(bufmgr_sprd->tgl_fd, bo_sprd->name, cache_state.val); + + return 1; +} + +static int +_bo_set_cache_state(tbm_bo bo, int device, int opt) +{ + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; + char need_flush = 0; + unsigned short cntFlush = 0; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + + if (bo_sprd->flags_sprd & SPRD_BO_NONCACHABLE) + return 1; + + /* get cache state of a bo */ + bo_sprd->cache_state.val = _tgl_get_data(bufmgr_sprd->tgl_fd, bo_sprd->name); + + /* get global cache flush count */ + cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY); + + if (opt == TBM_DEVICE_CPU) { + if (bo_sprd->cache_state.data.isDirtied == DEVICE_CO && + bo_sprd->cache_state.data.isCached) + need_flush = TBM_SPRD_CACHE_INV; + + bo_sprd->cache_state.data.isCached = 1; + if (opt & TBM_OPTION_WRITE) + bo_sprd->cache_state.data.isDirtied = DEVICE_CA; + else { + if (bo_sprd->cache_state.data.isDirtied != DEVICE_CA) + bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; + } + } else { + if (bo_sprd->cache_state.data.isDirtied == DEVICE_CA && + bo_sprd->cache_state.data.isCached && + bo_sprd->cache_state.data.cntFlush == cntFlush) + need_flush = TBM_SPRD_CACHE_CLN | TBM_SPRD_CACHE_ALL; + + if (opt & TBM_OPTION_WRITE) + bo_sprd->cache_state.data.isDirtied = DEVICE_CO; + else { + if (bo_sprd->cache_state.data.isDirtied != DEVICE_CO) + bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; + } + } + + if (need_flush) + { + if (need_flush & TBM_SPRD_CACHE_ALL) + _tgl_set_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY, (unsigned int)(++cntFlush)); + + /* call cache flush */ + _sprd_bo_cache_flush (bo, need_flush); + + DBG("[libtbm:%d] \tcache(%d,%d)....flush:0x%x, cntFlush(%d)\n", + getpid(), + bo_sprd->cache_state.data.isCached, + bo_sprd->cache_state.data.isDirtied, + need_flush, + cntFlush); + } + + return 1; +} + +static int +_bo_save_cache_state(tbm_bo bo) +{ + unsigned short cntFlush = 0; + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + + /* get global cache flush count */ + cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY); + + /* save global cache flush count */ + bo_sprd->cache_state.data.cntFlush = cntFlush; + _tgl_set_data(bufmgr_sprd->tgl_fd, bo_sprd->name, bo_sprd->cache_state.val); + + return 1; +} + +static void +_bo_destroy_cache_state(tbm_bo bo) +{ + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_IF_FAIL (bo_sprd!=NULL); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_IF_FAIL (bufmgr_sprd!=NULL); + + _tgl_destroy(bufmgr_sprd->tgl_fd, bo_sprd->name); +} + +static inline int +_is_drm_master(int drm_fd) +{ + drm_magic_t magic; + + return drmGetMagic(drm_fd, &magic) == 0 && + drmAuthMagic(drm_fd, magic) == 0; +} + #ifndef USE_CONTIG_ONLY static unsigned int @@ -381,60 +682,6 @@ _sprd_bo_handle (tbm_bo_sprd bo_sprd, int device) return bo_handle; } -#ifdef USE_CACHE -static int -_sprd_cache_flush (int fd, tbm_bo_sprd bo_sprd, int flags) -{ - struct drm_sprd_gem_cache_op cache_op = {0, }; - int ret; - - /* if bo_sprd is null, do cache_flush_all */ - if(bo_sprd) - { - cache_op.flags = 0; - cache_op.usr_addr = (uint64_t)((uint32_t)bo_sprd->pBase); - cache_op.size = bo_sprd->size; - } - else - { - flags = TBM_CACHE_FLUSH_ALL; - cache_op.flags = 0; - cache_op.usr_addr = 0; - cache_op.size = 0; - } - - if (flags & TBM_CACHE_INV) - { - if(flags & TBM_CACHE_ALL) - cache_op.flags |= SPRD_DRM_CACHE_INV_ALL; - else - cache_op.flags |= SPRD_DRM_CACHE_INV_RANGE; - } - - if (flags & TBM_CACHE_CLN) - { - if(flags & TBM_CACHE_ALL) - cache_op.flags |= SPRD_DRM_CACHE_CLN_ALL; - else - cache_op.flags |= SPRD_DRM_CACHE_CLN_RANGE; - } - - if(flags & TBM_CACHE_ALL) - cache_op.flags |= SPRD_DRM_ALL_CACHES_CORES; - - ret = drmCommandWriteRead (fd, DRM_SPRD_GEM_CACHE_OP, &cache_op, sizeof(cache_op)); - if (ret) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fail to flush the cache.\n", - getpid(), __FUNCTION__, __LINE__); - return 0; - } - - return 1; -} -#endif - static int tbm_sprd_bo_size (tbm_bo bo) { @@ -498,6 +745,13 @@ tbm_sprd_bo_alloc (tbm_bo bo, int size, int flags) bo_sprd->flags_sprd = sprd_flags; bo_sprd->name = _get_name (bo_sprd->fd, bo_sprd->gem); + if (!_bo_init_cache_state(bufmgr_sprd, bo_sprd)) + { + TBM_SPRD_LOG ("error fail init cache state(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } + pthread_mutex_init(&bo_sprd->mutex, NULL); if (bufmgr_sprd->use_dma_fence @@ -520,6 +774,7 @@ tbm_sprd_bo_alloc (tbm_bo bo, int size, int flags) /* add bo to hash */ PrivGem* privGem = calloc (1, sizeof(PrivGem)); privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; if (drmHashInsert(bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] " @@ -592,6 +847,8 @@ tbm_sprd_bo_free(tbm_bo bo) getpid(), __FUNCTION__, __LINE__, bo_sprd->name, ret); } + _bo_destroy_cache_state(bo); + /* Free gem handle */ struct drm_gem_close arg = {0, }; memset (&arg, 0, sizeof(arg)); @@ -614,10 +871,19 @@ tbm_sprd_bo_import (tbm_bo bo, unsigned int key) tbm_bufmgr_sprd bufmgr_sprd; tbm_bo_sprd bo_sprd; + PrivGem *privGem = NULL; + int ret; bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + ret = drmHashLookup (bufmgr_sprd->hashBos, key, (void**)&privGem); + if (ret == 0) + { + privGem->ref_count++; + return privGem->bo_priv; + } + struct drm_gem_open arg = {0, }; struct drm_sprd_gem_info info = {0, }; @@ -663,6 +929,12 @@ tbm_sprd_bo_import (tbm_bo bo, unsigned int key) bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); #endif + if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) + { + TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } if (!bo_sprd->dmabuf) { @@ -681,26 +953,10 @@ tbm_sprd_bo_import (tbm_bo bo, unsigned int key) } /* add bo to hash */ - PrivGem *privGem = NULL; - int ret; - - ret = drmHashLookup (bufmgr_sprd->hashBos, bo_sprd->name, (void**)&privGem); - if (ret == 0) - { - privGem->ref_count++; - } - else if (ret == 1) - { - privGem = calloc (1, sizeof(PrivGem)); - privGem->ref_count = 1; - if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot insert bo to Hash(%d)\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->name); - } - } - else + privGem = calloc (1, sizeof(PrivGem)); + privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; + if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] " "error %s:%d Cannot insert bo to Hash(%d)\n", @@ -722,15 +978,15 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) tbm_bufmgr_sprd bufmgr_sprd; tbm_bo_sprd bo_sprd; + PrivGem *privGem = NULL; + int ret; + int name; bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); - unsigned int gem = 0; - unsigned int real_size = -1; - struct drm_sprd_gem_info info = {0, }; - //getting handle from fd + unsigned int gem = 0; struct drm_prime_handle arg = {0, }; arg.fd = key; @@ -743,6 +999,21 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) } gem = arg.handle; + name = _get_name (bufmgr_sprd->fd, gem); + + ret = drmHashLookup (bufmgr_sprd->hashBos, name, (void**)&privGem); + if (ret == 0) + { + if (gem == privGem->bo_priv->gem) + { + privGem->ref_count++; + return privGem->bo_priv; + } + } + + unsigned int real_size = -1; + struct drm_sprd_gem_info info = {0, }; + /* 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 @@ -777,7 +1048,7 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) bo_sprd->flags_sprd = info.flags; bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); - bo_sprd->name = _get_name(bo_sprd->fd, bo_sprd->gem); + bo_sprd->name = name; if (!bo_sprd->name) { TBM_SPRD_LOG ("error bo:%p Cannot get name from gem:%d, fd:%d (%s)\n", @@ -786,38 +1057,32 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) return 0; } + if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) + { + TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } + /* add bo to hash */ - PrivGem *privGem = NULL; - int ret; + privGem = NULL; - ret = drmHashLookup (bufmgr_sprd->hashBos, bo_sprd->name, (void**)&privGem); - if (ret == 0) + privGem = calloc (1, sizeof(PrivGem)); + if (!privGem) { - privGem->ref_count++; + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Fail to calloc privGem\n", + getpid(), __FUNCTION__, __LINE__); + free (bo_sprd); + return 0; } - else if (ret == 1) - { - privGem = calloc (1, sizeof(PrivGem)); - if (!privGem) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Fail to calloc privGem\n", - getpid(), __FUNCTION__, __LINE__); - free (bo_sprd); - return 0; - } - privGem->ref_count = 1; - if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) - { - TBM_SPRD_LOG ("error bo:%p Cannot insert bo to Hash(%d) from gem:%d, fd:%d\n", - bo, bo_sprd->name, gem, key); - } - } - else + privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; + if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { TBM_SPRD_LOG ("error bo:%p Cannot insert bo to Hash(%d) from gem:%d, fd:%d\n", - bo, bo_sprd->name, gem, key); + bo, bo_sprd->name, gem, key); } DBG (" [%s] bo:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d(%d), size:%d\n", target_name(), @@ -962,6 +1227,11 @@ tbm_sprd_bo_map (tbm_bo bo, int device, int opt) return (tbm_bo_handle) NULL; } + if (bo_sprd->map_cnt == 0) + _bo_set_cache_state (bo, device, opt); + + bo_sprd->map_cnt++; + return bo_handle; } @@ -978,59 +1248,18 @@ tbm_sprd_bo_unmap (tbm_bo bo) if (!bo_sprd->gem) return 0; - DBG ("[libtbm-sprd:%d] %s gem:%d(%d) \n", getpid(), - __FUNCTION__, bo_sprd->gem, bo_sprd->name); + bo_sprd->map_cnt--; - return 1; -} - -static int -tbm_sprd_bo_cache_flush (tbm_bo bo, int flags) -{ - tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); - - /* cache flush is managed by kernel side when using dma-fence. */ - if (bufmgr_sprd->use_dma_fence) - return 1; + if (bo_sprd->map_cnt == 0) + _bo_save_cache_state (bo); - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); - - tbm_bo_sprd bo_sprd; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - -#ifdef USE_CACHE - if (!_sprd_cache_flush(bo_sprd->fd, bo_sprd, flags)) - return 0; -#endif + DBG ("[libtbm-sprd:%d] %s gem:%d(%d) \n", getpid(), + __FUNCTION__, bo_sprd->gem, bo_sprd->name); return 1; } static int -tbm_sprd_bo_get_global_key (tbm_bo bo) -{ - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); - - tbm_bo_sprd bo_sprd; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - - if (!bo_sprd->name) - { - if (!bo_sprd->gem) - return 0; - - bo_sprd->name = _get_name(bo_sprd->fd, bo_sprd->gem); - } - - return bo_sprd->name; -} - -static int tbm_sprd_bo_lock(tbm_bo bo, int device, int opt) { SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); @@ -1204,8 +1433,10 @@ tbm_sprd_bufmgr_deinit (void *priv) bufmgr_sprd->hashBos = NULL; } - if (bufmgr_sprd->fd_owner) - close (bufmgr_sprd->fd_owner); + close (bufmgr_sprd->tgl_fd); + + if (bufmgr_sprd->bind_display) + tbm_drm_helper_wl_server_deinit(); free (bufmgr_sprd); } @@ -1484,336 +1715,38 @@ tbm_sprd_surface_get_plane_data(tbm_surface_h surface, int width, int height, tb return ret; } -/** -* @brief get the size of the surface with a format. -* @param[in] surface : the surface -* @param[in] width : the width of the surface -* @param[in] height : the height of the surface -* @param[in] format : the format of the surface -* @return size of the surface if this function succeeds, otherwise 0. -*/ int -tbm_sprd_surface_get_size(tbm_surface_h surface, int width, int height, tbm_format format) +tbm_sprd_bo_get_flags (tbm_bo bo) { - int ret = 0; - int bpp = 0; - int _pitch =0; - int _size =0; - int align =TBM_SURFACE_ALIGNMENT_PLANE; - - - switch(format) - { - /* 16 bpp RGB */ - case TBM_FORMAT_XRGB4444: - case TBM_FORMAT_XBGR4444: - case TBM_FORMAT_RGBX4444: - case TBM_FORMAT_BGRX4444: - case TBM_FORMAT_ARGB4444: - case TBM_FORMAT_ABGR4444: - case TBM_FORMAT_RGBA4444: - case TBM_FORMAT_BGRA4444: - case TBM_FORMAT_XRGB1555: - case TBM_FORMAT_XBGR1555: - case TBM_FORMAT_RGBX5551: - case TBM_FORMAT_BGRX5551: - case TBM_FORMAT_ARGB1555: - case TBM_FORMAT_ABGR1555: - case TBM_FORMAT_RGBA5551: - case TBM_FORMAT_BGRA5551: - case TBM_FORMAT_RGB565: - bpp = 16; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - break; - /* 24 bpp RGB */ - case TBM_FORMAT_RGB888: - case TBM_FORMAT_BGR888: - bpp = 24; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - break; - /* 32 bpp RGB */ - case TBM_FORMAT_XRGB8888: - case TBM_FORMAT_XBGR8888: - case TBM_FORMAT_RGBX8888: - case TBM_FORMAT_BGRX8888: - case TBM_FORMAT_ARGB8888: - case TBM_FORMAT_ABGR8888: - case TBM_FORMAT_RGBA8888: - case TBM_FORMAT_BGRA8888: - bpp = 32; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - break; - /* packed YCbCr */ - case TBM_FORMAT_YUYV: - case TBM_FORMAT_YVYU: - case TBM_FORMAT_UYVY: - case TBM_FORMAT_VYUY: - case TBM_FORMAT_AYUV: - bpp = 32; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - break; - /* - * 2 plane YCbCr - * index 0 = Y plane, [7:0] Y - * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian - * or - * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian - */ - case TBM_FORMAT_NV12: - case TBM_FORMAT_NV21: - bpp = 12; - //plane_idx == 0 - { - _pitch = SIZE_ALIGN( width ,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx ==1 - { - _pitch = SIZE_ALIGN( width ,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - } - break; - case TBM_FORMAT_NV16: - case TBM_FORMAT_NV61: - bpp = 16; - //plane_idx == 0 - { - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx ==1 - { - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - - break; - /* - * 3 plane YCbCr - * index 0: Y plane, [7:0] Y - * index 1: Cb plane, [7:0] Cb - * index 2: Cr plane, [7:0] Cr - * or - * index 1: Cr plane, [7:0] Cr - * index 2: Cb plane, [7:0] Cb - */ - case TBM_FORMAT_YUV410: - case TBM_FORMAT_YVU410: - bpp = 9; - align = TBM_SURFACE_ALIGNMENT_PITCH_YUV; - break; - case TBM_FORMAT_YUV411: - case TBM_FORMAT_YVU411: - case TBM_FORMAT_YUV420: - case TBM_FORMAT_YVU420: - bpp = 12; - //plane_idx == 0 - { - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx == 1 - { - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx == 2 - { - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - } - - break; - case TBM_FORMAT_YUV422: - case TBM_FORMAT_YVU422: - bpp = 16; - //plane_idx == 0 - { - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx == 1 - { - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - //plane_idx == 2 - { - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size += SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - } - break; - case TBM_FORMAT_YUV444: - case TBM_FORMAT_YVU444: - bpp = 24; - align = TBM_SURFACE_ALIGNMENT_PITCH_YUV; - break; - - default: - bpp = 0; - break; - } + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - if(_size > 0) - ret = _size; - else - ret = SIZE_ALIGN( (width * height * bpp) >> 3, align); + tbm_bo_sprd bo_sprd; - return ret; + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + return bo_sprd->flags_tbm; } int -tbm_sprd_surface_get_num_bos(tbm_format format) -{ - int num = 0; - - switch(format) - { - /* 16 bpp RGB */ - case TBM_FORMAT_XRGB4444: - case TBM_FORMAT_XBGR4444: - case TBM_FORMAT_RGBX4444: - case TBM_FORMAT_BGRX4444: - case TBM_FORMAT_ARGB4444: - case TBM_FORMAT_ABGR4444: - case TBM_FORMAT_RGBA4444: - case TBM_FORMAT_BGRA4444: - case TBM_FORMAT_XRGB1555: - case TBM_FORMAT_XBGR1555: - case TBM_FORMAT_RGBX5551: - case TBM_FORMAT_BGRX5551: - case TBM_FORMAT_ARGB1555: - case TBM_FORMAT_ABGR1555: - case TBM_FORMAT_RGBA5551: - case TBM_FORMAT_BGRA5551: - case TBM_FORMAT_RGB565: - /* 24 bpp RGB */ - case TBM_FORMAT_RGB888: - case TBM_FORMAT_BGR888: - /* 32 bpp RGB */ - case TBM_FORMAT_XRGB8888: - case TBM_FORMAT_XBGR8888: - case TBM_FORMAT_RGBX8888: - case TBM_FORMAT_BGRX8888: - case TBM_FORMAT_ARGB8888: - case TBM_FORMAT_ABGR8888: - case TBM_FORMAT_RGBA8888: - case TBM_FORMAT_BGRA8888: - /* packed YCbCr */ - case TBM_FORMAT_YUYV: - case TBM_FORMAT_YVYU: - case TBM_FORMAT_UYVY: - case TBM_FORMAT_VYUY: - case TBM_FORMAT_AYUV: - /* - * 2 plane YCbCr - * index 0 = Y plane, [7:0] Y - * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian - * or - * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian - */ - case TBM_FORMAT_NV12: - case TBM_FORMAT_NV21: - case TBM_FORMAT_NV16: - case TBM_FORMAT_NV61: - /* - * 3 plane YCbCr - * index 0: Y plane, [7:0] Y - * index 1: Cb plane, [7:0] Cb - * index 2: Cr plane, [7:0] Cr - * or - * index 1: Cr plane, [7:0] Cr - * index 2: Cb plane, [7:0] Cb - */ - case TBM_FORMAT_YUV410: - case TBM_FORMAT_YVU410: - case TBM_FORMAT_YUV411: - case TBM_FORMAT_YVU411: - case TBM_FORMAT_YUV420: - case TBM_FORMAT_YVU420: - case TBM_FORMAT_YUV422: - case TBM_FORMAT_YVU422: - case TBM_FORMAT_YUV444: - case TBM_FORMAT_YVU444: - num = 1; - break; - - default: - num = 0; - break; - } - - return num; -} - -tbm_bo_handle -tbm_sprd_fd_to_handle(tbm_bufmgr bufmgr, tbm_fd fd, int device) +tbm_sprd_bufmgr_bind_native_display (tbm_bufmgr bufmgr, void *NativeDisplay) { - SPRD_RETURN_VAL_IF_FAIL (bufmgr!=NULL, (tbm_bo_handle) NULL); - SPRD_RETURN_VAL_IF_FAIL (fd > 0, (tbm_bo_handle) NULL); + tbm_bufmgr_sprd bufmgr_sprd; - tbm_bo_handle bo_handle; - memset (&bo_handle, 0x0, sizeof (uint64_t)); + bufmgr_sprd = tbm_backend_get_priv_from_bufmgr(bufmgr); + SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0); - tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_priv_from_bufmgr(bufmgr); + if (!tbm_drm_helper_wl_server_init(NativeDisplay, bufmgr_sprd->fd, "/dev/dri/card0", 0)) { + TBM_SPRD_LOG("[libtbm-sprd:%d] error:Fail to tbm_drm_helper_wl_server_init\n"); + return 0; + } - switch(device) - { - case TBM_DEVICE_DEFAULT: - case TBM_DEVICE_2D: - { - //getting handle from fd - struct drm_prime_handle arg = {0, }; + bufmgr_sprd->bind_display = NativeDisplay; - arg.fd = fd; - arg.flags = 0; - if (drmIoctl (bufmgr_sprd->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &arg)) - { - TBM_SPRD_LOG ("error Cannot get gem handle from fd:%d (%s)\n", - arg.fd, strerror(errno)); - return (tbm_bo_handle) NULL; - } - - bo_handle.u32 = (uint32_t)arg.handle;; - break; - } - case TBM_DEVICE_CPU: - TBM_SPRD_LOG ("Not supported device:%d\n", device); - bo_handle.ptr = (void *) NULL; - break; - case TBM_DEVICE_3D: - case TBM_DEVICE_MM: - bo_handle.u32 = (uint32_t)fd; - break; - default: - TBM_SPRD_LOG ("error Not supported device:%d\n", device); - bo_handle.ptr = (void *) NULL; - break; - } - - return bo_handle; -} - -int -tbm_sprd_bo_get_flags (tbm_bo bo) -{ - SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - - tbm_bo_sprd bo_sprd; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); - - return bo_sprd->flags_tbm; + return 1; } - MODULEINITPPROTO (init_tbm_bufmgr_priv); static TBMModuleVersionInfo SprdVersRec = @@ -1841,17 +1774,46 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) return 0; } - if (fd < 0) - { - bufmgr_sprd->fd = tbm_bufmgr_get_drm_fd_wayland(); - bufmgr_sprd->fd_owner = 1; + if (tbm_backend_is_display_server()) { + bufmgr_sprd->fd = -1; + bufmgr_sprd->fd = tbm_drm_helper_get_master_fd(); + if (bufmgr_sprd->fd <0) { + bufmgr_sprd->fd = _tbm_sprd_open_drm(); + tbm_drm_helper_set_master_fd(bufmgr_sprd->fd); + } + if (bufmgr_sprd->fd <0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); + free (bufmgr_sprd); + return 0; + } + } else { + if (!tbm_drm_helper_get_auth_info(&(bufmgr_sprd->fd), NULL, NULL)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to get auth drm info!\n", getpid()); + free (bufmgr_sprd); + return 0; + } + } + + /* open tgl fd for saving cache flush data */ + bufmgr_sprd->tgl_fd = open(tgl_devfile, O_RDWR); + + if (bufmgr_sprd->tgl_fd < 0) { + bufmgr_sprd->tgl_fd = open(tgl_devfile1, O_RDWR); + if (bufmgr_sprd->tgl_fd < 0) { + TBM_SPRD_LOG("[libtbm:%d] " + "error: Fail to open global_lock:%s\n", + getpid(), tgl_devfile); + + free (bufmgr_sprd); + return 0; + } } - else - bufmgr_sprd->fd = fd; - if (bufmgr_sprd->fd < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); + if (!_tgl_init(bufmgr_sprd->tgl_fd, GLOBAL_KEY)) { + TBM_SPRD_LOG("[libtbm:%d] " + "error: Fail to initialize the tgl\n", + getpid()); + free (bufmgr_sprd); return 0; } @@ -1878,9 +1840,6 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); - if (bufmgr_sprd->fd_owner) - close(bufmgr_sprd->fd); - free (bufmgr_sprd); return 0; } @@ -1897,37 +1856,22 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) bufmgr_backend->bo_get_handle = tbm_sprd_bo_get_handle, bufmgr_backend->bo_map = tbm_sprd_bo_map, bufmgr_backend->bo_unmap = tbm_sprd_bo_unmap, - bufmgr_backend->bo_cache_flush = tbm_sprd_bo_cache_flush, - bufmgr_backend->bo_get_global_key = tbm_sprd_bo_get_global_key; bufmgr_backend->surface_get_plane_data = tbm_sprd_surface_get_plane_data; - bufmgr_backend->surface_get_size = tbm_sprd_surface_get_size; bufmgr_backend->surface_supported_format = tbm_sprd_surface_supported_format; - bufmgr_backend->fd_to_handle = tbm_sprd_fd_to_handle; - bufmgr_backend->surface_get_num_bos = tbm_sprd_surface_get_num_bos; bufmgr_backend->bo_get_flags = tbm_sprd_bo_get_flags; + bufmgr_backend->bo_lock = NULL; + bufmgr_backend->bo_lock2 = tbm_sprd_bo_lock; + bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; + bufmgr_backend->bufmgr_bind_native_display = tbm_sprd_bufmgr_bind_native_display; - if (bufmgr_sprd->use_dma_fence) - { - bufmgr_backend->flags = (TBM_LOCK_CTRL_BACKEND | TBM_CACHE_CTRL_BACKEND); - bufmgr_backend->bo_lock = NULL; - bufmgr_backend->bo_lock2 = tbm_sprd_bo_lock; - bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; - } - else - { - bufmgr_backend->flags = 0; - bufmgr_backend->bo_lock = NULL; - bufmgr_backend->bo_unlock = NULL; - } + bufmgr_backend->flags |= TBM_LOCK_CTRL_BACKEND; + bufmgr_backend->flags |= TBM_USE_2_0_BACKEND; if (!tbm_backend_init (bufmgr, bufmgr_backend)) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to init backend!\n", getpid()); tbm_backend_free (bufmgr_backend); - if (bufmgr_sprd->fd_owner) - close(bufmgr_sprd->fd); - free (bufmgr_sprd); return 0; } diff --git a/src/tbm_bufmgr_tgl.h b/src/tbm_bufmgr_tgl.h new file mode 100644 index 0000000..2279cac --- /dev/null +++ b/src/tbm_bufmgr_tgl.h @@ -0,0 +1,70 @@ +/************************************************************************** + * + * libtbm + * + * Copyright 2012 Samsung Electronics co., Ltd. All Rights Reserved. + * + * Contact: SooChan Lim , Sangjin Lee + * Boram Park , Changyeon Lee + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + * + * **************************************************************************/ + +#ifndef __TBM_BUFMGR_TGL_H__ +#define __TBM_BUFMGR_TGL_H__ + +#include + +static char tgl_devfile[] = "/dev/slp_global_lock"; +static char tgl_devfile1[] = "/dev/tgl"; + +#define TGL_IOC_BASE 0x32 + +struct tgl_attribute { + unsigned int key; + unsigned int timeout_ms; +}; + +struct tgl_user_data { + unsigned int key; + unsigned int data1; + unsigned int data2; + unsigned int locked; +}; + +typedef enum { + _TGL_INIT_LOCK = 1, + _TGL_DESTROY_LOCK, + _TGL_LOCK_LOCK, + _TGL_UNLOCK_LOCK, + _TGL_SET_DATA, + _TGL_GET_DATA, +} _tgl_ioctls; + +#define TGL_IOC_INIT_LOCK _IOW(TGL_IOC_BASE, _TGL_INIT_LOCK, struct tgl_attribute *) +#define TGL_IOC_DESTROY_LOCK _IOW(TGL_IOC_BASE, _TGL_DESTROY_LOCK, unsigned int) +#define TGL_IOC_LOCK_LOCK _IOW(TGL_IOC_BASE, _TGL_LOCK_LOCK, unsigned int) +#define TGL_IOC_UNLOCK_LOCK _IOW(TGL_IOC_BASE, _TGL_UNLOCK_LOCK, unsigned int) +#define TGL_IOC_SET_DATA _IOW(TGL_IOC_BASE, _TGL_SET_DATA, struct tgl_user_data *) +#define TGL_IOC_GET_DATA _IOW(TGL_IOC_BASE, _TGL_GET_DATA, struct tgl_user_data *) + +#endif /* __TBM_BUFMGR_TGL_H__ */ diff --git a/src/tbm_wayland.c b/src/tbm_wayland.c deleted file mode 100644 index 57286ff..0000000 --- a/src/tbm_wayland.c +++ /dev/null @@ -1,279 +0,0 @@ -/************************************************************************** - -libtbm - -Copyright 2012 Samsung Electronics co., Ltd. All Rights Reserved. - -Contact: SooChan Lim , Sangjin Lee -Boram Park , Changyeon Lee - -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, sub license, 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 NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. - -**************************************************************************/ - -#include "config.h" - -#include - -#include -#include -#include -#include -#include -#include - -#include "wayland-util.h" - -extern const struct wl_interface wl_buffer_interface; - -static const struct wl_interface *types[] = { - NULL, - NULL, - NULL, - &wl_buffer_interface, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &wl_buffer_interface, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; - -static const struct wl_message wl_tbm_requests[] = { - {"create_buffer", "niiuiiiiiiiiiiuiuuu", types + 3}, - {"create_buffer_with_fd", "niiuiiiiiiiiiiuihhh", types + 22}, - {"get_authentication_info", "", types + 0}, -}; - -static const struct wl_message wl_tbm_events[] = { - {"authentication_info", "suh", types + 0}, -}; - -WL_EXPORT const struct wl_interface wl_tbm_interface = { - "wl_tbm", 1, - 3, wl_tbm_requests, - 1, wl_tbm_events, -}; - -struct wl_buffer; -struct wl_tbm; - -extern const struct wl_interface wl_tbm_interface; - -#ifndef WL_TBM_ERROR_ENUM -#define WL_TBM_ERROR_ENUM -enum wl_tbm_error { - WL_TBM_ERROR_AUTHENTICATE_FAIL = 0, - WL_TBM_ERROR_INVALID_FORMAT = 1, - WL_TBM_ERROR_INVALID_NAME = 2, -}; -#endif /* WL_TBM_ERROR_ENUM */ - -struct wl_tbm_listener { - /** - * authentication_info - (none) - * @device_name: (none) - * @capabilities: (none) - * @auth_fd: (none) - */ - void (*authentication_info) (void *data, struct wl_tbm * wl_tbm, const char *device_name, uint32_t capabilities, int32_t auth_fd); -}; - -static inline int wl_tbm_add_listener(struct wl_tbm *wl_tbm, const struct wl_tbm_listener *listener, void *data) -{ - return wl_proxy_add_listener((struct wl_proxy *)wl_tbm, (void (**)(void))listener, data); -} - -#define WL_TBM_CREATE_BUFFER 0 -#define WL_TBM_CREATE_BUFFER_WITH_FD 1 -#define WL_TBM_GET_AUTHENTICATION_INFO 2 - -static inline void wl_tbm_set_user_data(struct wl_tbm *wl_tbm, void *user_data) -{ - wl_proxy_set_user_data((struct wl_proxy *)wl_tbm, user_data); -} - -static inline void *wl_tbm_get_user_data(struct wl_tbm *wl_tbm) -{ - return wl_proxy_get_user_data((struct wl_proxy *)wl_tbm); -} - -static inline void wl_tbm_destroy(struct wl_tbm *wl_tbm) -{ - wl_proxy_destroy((struct wl_proxy *)wl_tbm); -} - -static inline void wl_tbm_get_authentication_info(struct wl_tbm *wl_tbm) -{ - wl_proxy_marshal((struct wl_proxy *)wl_tbm, WL_TBM_GET_AUTHENTICATION_INFO); -} - -struct wl_tbm_info { - struct wl_display *dpy; - struct wl_event_queue *wl_queue; - struct wl_tbm *wl_tbm; - - uint32_t capabilities; - char *device; - int32_t fd; -}; - -static void handle_tbm_authentication_info(void *data, struct wl_tbm *wl_tbm, const char *device_name, uint32_t capabilities, int32_t auth_fd) -{ - struct wl_tbm_info *info = (struct wl_tbm_info *)data; - - info->fd = auth_fd; - info->capabilities = capabilities; - if (device_name) - info->device = strndup(device_name, 256); -} - -static const struct wl_tbm_listener wl_tbm_client_listener = { - handle_tbm_authentication_info -}; - -static void wl_client_registry_handle_global(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) -{ - struct wl_tbm_info *info = (struct wl_tbm_info *)data; - - if (!strcmp(interface, "wl_tbm")) { - info->wl_tbm = wl_registry_bind(registry, name, &wl_tbm_interface, version); - if (!info->wl_tbm) { - printf("Failed to bind wl_tbm\n"); - return; - } - - wl_tbm_add_listener(info->wl_tbm, &wl_tbm_client_listener, info); - wl_proxy_set_queue((struct wl_proxy *)info->wl_tbm, info->wl_queue); - } -} - -static int tbm_util_get_drm_fd(void *dpy, int *fd) -{ - struct wl_display *disp = NULL; - struct wl_registry *wl_registry; - struct wl_tbm_info info = { - .dpy = NULL, - .wl_queue = NULL, - .wl_tbm = NULL, - .capabilities = 0, - .device = NULL, - .fd = 0, - }; - - static const struct wl_registry_listener registry_listener = { - wl_client_registry_handle_global, - NULL - }; - - if (!fd) - return -1; - - if (!dpy) { - disp = wl_display_connect(NULL); - if (!disp) { - printf("Failed to create a new display connection\n"); - return -1; - } - dpy = disp; - } - - info.dpy = dpy; - info.wl_queue = wl_display_create_queue(dpy); - if (!info.wl_queue) { - printf("Failed to create a WL Queue\n"); - if (disp == dpy) - wl_display_disconnect(disp); - - return -1; - } - - wl_registry = wl_display_get_registry(dpy); - if (!wl_registry) { - printf("Failed to get registry\n"); - wl_event_queue_destroy(info.wl_queue); - if (disp == dpy) - wl_display_disconnect(disp); - - return -1; - } - wl_proxy_set_queue((struct wl_proxy *)wl_registry, info.wl_queue); - wl_registry_add_listener(wl_registry, ®istry_listener, &info); - wl_display_roundtrip_queue(dpy, info.wl_queue); - - wl_tbm_get_authentication_info(info.wl_tbm); - wl_display_roundtrip_queue(dpy, info.wl_queue); - - *fd = info.fd; - - wl_event_queue_destroy(info.wl_queue); - wl_registry_destroy(wl_registry); - - free(info.device); - wl_tbm_set_user_data(info.wl_tbm, NULL); - wl_tbm_destroy(info.wl_tbm); - - if (disp == dpy) - wl_display_disconnect(disp); - - return *fd >= 0 ? 0 : -1; -} - -int tbm_bufmgr_get_drm_fd_wayland() -{ - int fd = -1; - - if (tbm_util_get_drm_fd(NULL, &fd)) - printf("Failed to get drm_fd\n"); - - return fd; -} diff --git a/src/tbm_wayland.h b/src/tbm_wayland.h deleted file mode 100644 index 32ba395..0000000 --- a/src/tbm_wayland.h +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************** - -libtbm - -Copyright 2012 Samsung Electronics co., Ltd. All Rights Reserved. - -Contact: SooChan Lim , Sangjin Lee -Boram Park , Changyeon Lee - -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, sub license, 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 NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. - -**************************************************************************/ - -#ifndef _TBM_UTIL_H_ -#define _TBM_UTIL_H_ - -int tbm_bufmgr_get_drm_fd_wayland(); - -#endif /* _TBM_UTIL_H_ */ - -- 2.7.4 From 1bd88da305db3acb9f745c1f960f9d1601443b67 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Mon, 29 Feb 2016 21:45:17 +0900 Subject: [PATCH 04/16] Apply tizen coding rule Change-Id: I319067a0bdfa293ced385a6a4466a4c29c816ee1 --- src/tbm_bufmgr_sprd.c | 2705 ++++++++++++++++++++++++------------------------- 1 file changed, 1345 insertions(+), 1360 deletions(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 21aee52..9a5c482 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -62,44 +62,42 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef DEBUG #define LOG_TAG "TBM_BACKEND" #include -static int bDebug=0; +static int bDebug = 0; -char* target_name() +char * +target_name() { - FILE *f; - char *slash; - static int initialized = 0; - static char app_name[128]; + FILE *f; + char *slash; + static int initialized = 0; + static char app_name[128]; - if ( initialized ) - return app_name; + if ( initialized ) + return app_name; - /* get the application name */ - f = fopen("/proc/self/cmdline", "r"); + /* get the application name */ + f = fopen("/proc/self/cmdline", "r"); - if ( !f ) - { - return 0; - } + if ( !f ) { + return 0; + } - memset(app_name, 0x00, sizeof(app_name)); + memset(app_name, 0x00, sizeof(app_name)); - if ( fgets(app_name, 100, f) == NULL ) - { - fclose(f); - return 0; - } + if ( fgets(app_name, 100, f) == NULL ) { + fclose(f); + return 0; + } - fclose(f); + fclose(f); - if ( (slash=strrchr(app_name, '/')) != NULL ) - { - memmove(app_name, slash+1, strlen(slash)); - } + if ( (slash = strrchr(app_name, '/')) != NULL ) { + memmove(app_name, slash + 1, strlen(slash)); + } - initialized = 1; + initialized = 1; - return app_name; + return app_name; } #define TBM_SPRD_LOG(fmt, args...) LOGE("\033[31m" "[%s]" fmt "\033[0m", target_name(), ##args) #define DBG(fmt, args...) if(bDebug&01) LOGE("[%s]" fmt, target_name(), ##args) @@ -130,9 +128,9 @@ char* target_name() } struct dma_buf_info { - unsigned long size; - unsigned int fence_supported; - unsigned int padding; + unsigned long size; + unsigned int fence_supported; + unsigned int padding; }; #define DMA_BUF_ACCESS_READ 0x1 @@ -143,8 +141,8 @@ struct dma_buf_info { #define DMA_FENCE_LIST_MAX 5 struct dma_buf_fence { - unsigned long ctx; - unsigned int type; + unsigned long ctx; + unsigned int type; }; #define DMABUF_IOCTL_BASE 'F' @@ -174,91 +172,88 @@ typedef union _tbm_bo_cache_state tbm_bo_cache_state; union _tbm_bo_cache_state { unsigned int val; struct { - unsigned int cntFlush:16; /*Flush all index for sync */ - unsigned int isCached:1; - unsigned int isDirtied:2; + unsigned int cntFlush: 16; /*Flush all index for sync */ + unsigned int isCached: 1; + unsigned int isDirtied: 2; } data; }; typedef struct _tbm_bufmgr_sprd *tbm_bufmgr_sprd; typedef struct _tbm_bo_sprd *tbm_bo_sprd; -typedef struct _sprd_private -{ - int ref_count; - struct _tbm_bo_sprd *bo_priv; +typedef struct _sprd_private { + int ref_count; + struct _tbm_bo_sprd *bo_priv; } PrivGem; /* tbm buffor object for sprd */ -struct _tbm_bo_sprd -{ - int fd; +struct _tbm_bo_sprd { + int fd; - unsigned int name; /* FLINK ID */ + unsigned int name; /* FLINK ID */ - unsigned int gem; /* GEM Handle */ + unsigned int gem; /* GEM Handle */ - unsigned int dmabuf; /* fd for dmabuf */ + unsigned int dmabuf; /* fd for dmabuf */ - void *pBase; /* virtual address */ + void *pBase; /* virtual address */ - unsigned int size; + unsigned int size; - unsigned int flags_sprd; - unsigned int flags_tbm; + unsigned int flags_sprd; + unsigned int flags_tbm; - PrivGem* private; + PrivGem *private; - pthread_mutex_t mutex; - struct dma_buf_fence dma_fence[DMA_FENCE_LIST_MAX]; - int device; - int opt; + pthread_mutex_t mutex; + struct dma_buf_fence dma_fence[DMA_FENCE_LIST_MAX]; + int device; + int opt; - tbm_bo_cache_state cache_state; - unsigned int map_cnt; + tbm_bo_cache_state cache_state; + unsigned int map_cnt; }; /* tbm bufmgr private for sprd */ -struct _tbm_bufmgr_sprd -{ - int fd; - void* hashBos; +struct _tbm_bufmgr_sprd { + int fd; + void *hashBos; - int use_dma_fence; + int use_dma_fence; - int tgl_fd; + int tgl_fd; - void *bind_display; + void *bind_display; }; -char *STR_DEVICE[]= -{ - "DEF", - "CPU", - "2D", - "3D", - "MM" +char *STR_DEVICE[] = { + "DEF", + "CPU", + "2D", + "3D", + "MM" }; -char *STR_OPT[]= -{ - "NONE", - "RD", - "WR", - "RDWR" +char *STR_OPT[] = { + "NONE", + "RD", + "WR", + "RDWR" }; uint32_t tbm_sprd_color_format_list[TBM_COLOR_FORMAT_COUNT] = { TBM_FORMAT_RGBA8888, - TBM_FORMAT_BGRA8888, - TBM_FORMAT_RGBX8888, - TBM_FORMAT_RGB888, - TBM_FORMAT_NV12, - TBM_FORMAT_NV21, - TBM_FORMAT_YUV420, - TBM_FORMAT_YVU420 }; - -static inline int _tgl_init(int fd, unsigned int key) + TBM_FORMAT_BGRA8888, + TBM_FORMAT_RGBX8888, + TBM_FORMAT_RGB888, + TBM_FORMAT_NV12, + TBM_FORMAT_NV21, + TBM_FORMAT_YUV420, + TBM_FORMAT_YVU420 + }; + +static inline int +_tgl_init(int fd, unsigned int key) { struct tgl_attribute attr; int err; @@ -268,30 +263,64 @@ static inline int _tgl_init(int fd, unsigned int key) err = ioctl(fd, TGL_IOC_INIT_LOCK, &attr); if (err) { - TBM_SPRD_LOG("[libtbm:%d] " - "error(%s) %s:%d key:%d\n", - getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + TBM_SPRD_LOG("[libtbm-sprd:%d] error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); return 0; } return 1; } -static inline int _tgl_destroy(int fd, unsigned int key) +static inline int +_tgl_destroy(int fd, unsigned int key) { int err; + err = ioctl(fd, TGL_IOC_DESTROY_LOCK, key); if (err) { - TBM_SPRD_LOG("[libtbm:%d] " - "error(%s) %s:%d key:%d\n", - getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + TBM_SPRD_LOG("[libtbm-sprd:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); + return 0; + } + + return 1; +} + +static inline int +_tgl_lock(int fd, unsigned int key) +{ + int err; + + err = ioctl(fd, TGL_IOC_LOCK_LOCK, key); + if (err) { + TBM_SPRD_LOG("[libtbm-sprd:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); + return 0; + } + + return 1; +} + +static inline int +_tgl_unlock(int fd, unsigned int key) +{ + int err; + + err = ioctl(fd, TGL_IOC_UNLOCK_LOCK, key); + if (err) { + TBM_SPRD_LOG("[libtbm-sprd:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); return 0; } return 1; } -static inline int _tgl_set_data(int fd, unsigned int key, unsigned int val) +static inline int +_tgl_set_data(int fd, unsigned int key, unsigned int val) { int err; struct tgl_user_data arg; @@ -300,16 +329,17 @@ static inline int _tgl_set_data(int fd, unsigned int key, unsigned int val) arg.data1 = val; err = ioctl(fd, TGL_IOC_SET_DATA, &arg); if (err) { - TBM_SPRD_LOG("[libtbm:%d] " - "error(%s) %s:%d key:%d\n", - getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + TBM_SPRD_LOG("[libtbm-sprd:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); return 0; } return 1; } -static inline unsigned int _tgl_get_data(int fd, unsigned int key) +static inline unsigned int +_tgl_get_data(int fd, unsigned int key, unsigned int *locked) { int err; struct tgl_user_data arg = { 0, }; @@ -317,90 +347,88 @@ static inline unsigned int _tgl_get_data(int fd, unsigned int key) arg.key = key; err = ioctl(fd, TGL_IOC_GET_DATA, &arg); if (err) { - TBM_SPRD_LOG("[libtbm:%d] " - "error(%s) %s:%d key:%d\n", - getpid(), strerror(errno), __FUNCTION__, __LINE__, key); + TBM_SPRD_LOG("[libtbm-sprd:%d] " + "error(%s) %s:%d key:%d\n", + getpid(), strerror(errno), __func__, __LINE__, key); return 0; } + if (locked) + *locked = arg.locked; + return arg.data1; } static int _sprd_bo_cache_flush (tbm_bo bo, int flags) { - tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); - /* cache flush is managed by kernel side when using dma-fence. */ - if (bufmgr_sprd->use_dma_fence) - return 1; + /* cache flush is managed by kernel side when using dma-fence. */ + if (bufmgr_sprd->use_dma_fence) + return 1; - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bo_sprd bo_sprd; + tbm_bo_sprd bo_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); #ifdef USE_CACHE - struct drm_sprd_gem_cache_op cache_op = {0, }; - int ret; - - /* if bo_sprd is null, do cache_flush_all */ - if(bo_sprd) - { - cache_op.flags = 0; - cache_op.usr_addr = (uint64_t)((uint32_t)bo_sprd->pBase); - cache_op.size = bo_sprd->size; - } - else - { - flags = TBM_SPRD_CACHE_FLUSH_ALL; - cache_op.flags = 0; - cache_op.usr_addr = 0; - cache_op.size = 0; - } - - if (flags & TBM_SPRD_CACHE_INV) - { - if(flags & TBM_SPRD_CACHE_ALL) - cache_op.flags |= SPRD_DRM_CACHE_INV_ALL; - else - cache_op.flags |= SPRD_DRM_CACHE_INV_RANGE; - } - - if (flags & TBM_SPRD_CACHE_CLN) - { - if(flags & TBM_SPRD_CACHE_ALL) - cache_op.flags |= SPRD_DRM_CACHE_CLN_ALL; - else - cache_op.flags |= SPRD_DRM_CACHE_CLN_RANGE; - } - - if(flags & TBM_SPRD_CACHE_ALL) - cache_op.flags |= SPRD_DRM_ALL_CACHES_CORES; - - ret = drmCommandWriteRead (bufmgr_sprd->fd, DRM_SPRD_GEM_CACHE_OP, &cache_op, sizeof(cache_op)); - if (ret) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fail to flush the cache.\n", - getpid(), __FUNCTION__, __LINE__); - return 0; - } + struct drm_sprd_gem_cache_op cache_op = {0, }; + int ret; + + /* if bo_sprd is null, do cache_flush_all */ + if (bo_sprd) { + cache_op.flags = 0; + cache_op.usr_addr = (uint64_t)((uint32_t)bo_sprd->pBase); + cache_op.size = bo_sprd->size; + } else { + flags = TBM_SPRD_CACHE_FLUSH_ALL; + cache_op.flags = 0; + cache_op.usr_addr = 0; + cache_op.size = 0; + } + + if (flags & TBM_SPRD_CACHE_INV) { + if (flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_CACHE_INV_ALL; + else + cache_op.flags |= SPRD_DRM_CACHE_INV_RANGE; + } + + if (flags & TBM_SPRD_CACHE_CLN) { + if (flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_CACHE_CLN_ALL; + else + cache_op.flags |= SPRD_DRM_CACHE_CLN_RANGE; + } + + if (flags & TBM_SPRD_CACHE_ALL) + cache_op.flags |= SPRD_DRM_ALL_CACHES_CORES; + + ret = drmCommandWriteRead (bufmgr_sprd->fd, DRM_SPRD_GEM_CACHE_OP, &cache_op, + sizeof(cache_op)); + if (ret) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fail to flush the cache.\n", + getpid(), __FUNCTION__, __LINE__); + return 0; + } #endif - return 1; + return 1; } static int _bo_init_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd) { - tbm_bo_cache_state cache_state; + tbm_bo_cache_state cache_state; - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); _tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name); @@ -416,67 +444,66 @@ _bo_init_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd) static int _bo_set_cache_state(tbm_bo bo, int device, int opt) { - tbm_bo_sprd bo_sprd; - tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; char need_flush = 0; unsigned short cntFlush = 0; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); - - if (bo_sprd->flags_sprd & SPRD_BO_NONCACHABLE) - return 1; - - /* get cache state of a bo */ - bo_sprd->cache_state.val = _tgl_get_data(bufmgr_sprd->tgl_fd, bo_sprd->name); - - /* get global cache flush count */ - cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY); - - if (opt == TBM_DEVICE_CPU) { - if (bo_sprd->cache_state.data.isDirtied == DEVICE_CO && - bo_sprd->cache_state.data.isCached) - need_flush = TBM_SPRD_CACHE_INV; - - bo_sprd->cache_state.data.isCached = 1; - if (opt & TBM_OPTION_WRITE) - bo_sprd->cache_state.data.isDirtied = DEVICE_CA; - else { - if (bo_sprd->cache_state.data.isDirtied != DEVICE_CA) - bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; - } - } else { - if (bo_sprd->cache_state.data.isDirtied == DEVICE_CA && - bo_sprd->cache_state.data.isCached && - bo_sprd->cache_state.data.cntFlush == cntFlush) - need_flush = TBM_SPRD_CACHE_CLN | TBM_SPRD_CACHE_ALL; - - if (opt & TBM_OPTION_WRITE) - bo_sprd->cache_state.data.isDirtied = DEVICE_CO; - else { - if (bo_sprd->cache_state.data.isDirtied != DEVICE_CO) - bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; - } - } - - if (need_flush) - { - if (need_flush & TBM_SPRD_CACHE_ALL) - _tgl_set_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY, (unsigned int)(++cntFlush)); - - /* call cache flush */ - _sprd_bo_cache_flush (bo, need_flush); - - DBG("[libtbm:%d] \tcache(%d,%d)....flush:0x%x, cntFlush(%d)\n", - getpid(), - bo_sprd->cache_state.data.isCached, - bo_sprd->cache_state.data.isDirtied, - need_flush, - cntFlush); - } + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); + + if (bo_sprd->flags_sprd & SPRD_BO_NONCACHABLE) + return 1; + + /* get cache state of a bo */ + bo_sprd->cache_state.val = _tgl_get_data(bufmgr_sprd->tgl_fd, bo_sprd->name, NULL); + + /* get global cache flush count */ + cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY, NULL); + + if (opt == TBM_DEVICE_CPU) { + if (bo_sprd->cache_state.data.isDirtied == DEVICE_CO && + bo_sprd->cache_state.data.isCached) + need_flush = TBM_SPRD_CACHE_INV; + + bo_sprd->cache_state.data.isCached = 1; + if (opt & TBM_OPTION_WRITE) + bo_sprd->cache_state.data.isDirtied = DEVICE_CA; + else { + if (bo_sprd->cache_state.data.isDirtied != DEVICE_CA) + bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; + } + } else { + if (bo_sprd->cache_state.data.isDirtied == DEVICE_CA && + bo_sprd->cache_state.data.isCached && + bo_sprd->cache_state.data.cntFlush == cntFlush) + need_flush = TBM_SPRD_CACHE_CLN | TBM_SPRD_CACHE_ALL; + + if (opt & TBM_OPTION_WRITE) + bo_sprd->cache_state.data.isDirtied = DEVICE_CO; + else { + if (bo_sprd->cache_state.data.isDirtied != DEVICE_CO) + bo_sprd->cache_state.data.isDirtied = DEVICE_NONE; + } + } + + if (need_flush) { + if (need_flush & TBM_SPRD_CACHE_ALL) + _tgl_set_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY, (unsigned int)(++cntFlush)); + + /* call cache flush */ + _sprd_bo_cache_flush (bo, need_flush); + + DBG("[libtbm:%d] \tcache(%d,%d)....flush:0x%x, cntFlush(%d)\n", + getpid(), + bo_sprd->cache_state.data.isCached, + bo_sprd->cache_state.data.isDirtied, + need_flush, + cntFlush); + } return 1; } @@ -484,39 +511,39 @@ _bo_set_cache_state(tbm_bo bo, int device, int opt) static int _bo_save_cache_state(tbm_bo bo) { - unsigned short cntFlush = 0; - tbm_bo_sprd bo_sprd; - tbm_bufmgr_sprd bufmgr_sprd; + unsigned short cntFlush = 0; + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); - /* get global cache flush count */ - cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY); + /* get global cache flush count */ + cntFlush = (unsigned short)_tgl_get_data(bufmgr_sprd->tgl_fd, GLOBAL_KEY, NULL); - /* save global cache flush count */ - bo_sprd->cache_state.data.cntFlush = cntFlush; - _tgl_set_data(bufmgr_sprd->tgl_fd, bo_sprd->name, bo_sprd->cache_state.val); + /* save global cache flush count */ + bo_sprd->cache_state.data.cntFlush = cntFlush; + _tgl_set_data(bufmgr_sprd->tgl_fd, bo_sprd->name, bo_sprd->cache_state.val); - return 1; + return 1; } static void _bo_destroy_cache_state(tbm_bo bo) { - tbm_bo_sprd bo_sprd; - tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_IF_FAIL (bo_sprd!=NULL); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_IF_FAIL (bo_sprd != NULL); - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_IF_FAIL (bufmgr_sprd!=NULL); + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_IF_FAIL (bufmgr_sprd != NULL); - _tgl_destroy(bufmgr_sprd->tgl_fd, bo_sprd->name); + _tgl_destroy(bufmgr_sprd->tgl_fd, bo_sprd->name); } static inline int @@ -533,933 +560,900 @@ _is_drm_master(int drm_fd) static unsigned int _get_sprd_flag_from_tbm (unsigned int ftbm) { - unsigned int flags = 0; - -/* - * TBM_BO_DEFAULT => ION_HEAP_ID_MASK_SYSTEM - * TBM_BO_SCANOUT => ION_HEAP_ID_MASK_MM - * TBM_BO_VENDOR => ION_HEAP_ID_MASK_OVERLAY - * To be updated appropriately once DRM-GEM supports different heap id masks. - * */ - - if (ftbm & TBM_BO_SCANOUT) - { - flags = SPRD_BO_CONTIG; - } - else - { - flags = SPRD_BO_NONCONTIG | SPRD_BO_DEV_SYSTEM; - } - - if (ftbm & TBM_BO_WC) - flags |= SPRD_BO_WC; - else if (ftbm & TBM_BO_NONCACHABLE) - flags |= SPRD_BO_NONCACHABLE; - - return flags; + unsigned int flags = 0; + + /* + * TBM_BO_DEFAULT => ION_HEAP_ID_MASK_SYSTEM + * TBM_BO_SCANOUT => ION_HEAP_ID_MASK_MM + * TBM_BO_VENDOR => ION_HEAP_ID_MASK_OVERLAY + * To be updated appropriately once DRM-GEM supports different heap id masks. + * */ + + if (ftbm & TBM_BO_SCANOUT) { + flags = SPRD_BO_CONTIG; + } else { + flags = SPRD_BO_NONCONTIG | SPRD_BO_DEV_SYSTEM; + } + + if (ftbm & TBM_BO_WC) + flags |= SPRD_BO_WC; + else if (ftbm & TBM_BO_NONCACHABLE) + flags |= SPRD_BO_NONCACHABLE; + + return flags; } static unsigned int _get_tbm_flag_from_sprd (unsigned int fsprd) { - unsigned int flags = 0; + unsigned int flags = 0; - if (fsprd & SPRD_BO_NONCONTIG) - flags |= TBM_BO_DEFAULT; - else - flags |= TBM_BO_SCANOUT; + if (fsprd & SPRD_BO_NONCONTIG) + flags |= TBM_BO_DEFAULT; + else + flags |= TBM_BO_SCANOUT; - if (fsprd & SPRD_BO_WC) - flags |= TBM_BO_WC; - else if (fsprd & SPRD_BO_CACHABLE) - flags |= TBM_BO_DEFAULT; - else - flags |= TBM_BO_NONCACHABLE; + if (fsprd & SPRD_BO_WC) + flags |= TBM_BO_WC; + else if (fsprd & SPRD_BO_CACHABLE) + flags |= TBM_BO_DEFAULT; + else + flags |= TBM_BO_NONCACHABLE; - return flags; + return flags; } #endif static unsigned int _get_name (int fd, unsigned int gem) { - struct drm_gem_flink arg = {0,}; - - arg.handle = gem; - if (drmIoctl (fd, DRM_IOCTL_GEM_FLINK, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fail to get flink gem=%d\n", - getpid(), __FUNCTION__, __LINE__, gem); - return 0; - } - - return (unsigned int)arg.name; + struct drm_gem_flink arg = {0,}; + + arg.handle = gem; + if (drmIoctl (fd, DRM_IOCTL_GEM_FLINK, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fail to get flink gem=%d\n", + getpid(), __FUNCTION__, __LINE__, gem); + return 0; + } + + return (unsigned int)arg.name; } static tbm_bo_handle _sprd_bo_handle (tbm_bo_sprd bo_sprd, int device) { - tbm_bo_handle bo_handle; - memset (&bo_handle, 0x0, sizeof (uint64_t)); - - switch(device) - { - case TBM_DEVICE_DEFAULT: - case TBM_DEVICE_2D: - bo_handle.u32 = (uint32_t)bo_sprd->gem; - break; - case TBM_DEVICE_CPU: - if (!bo_sprd->pBase) - { - struct drm_sprd_gem_mmap arg = {0,}; - - arg.handle = bo_sprd->gem; - arg.size = bo_sprd->size; - if (drmCommandWriteRead (bo_sprd->fd, DRM_SPRD_GEM_MMAP, &arg, sizeof(arg))) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot usrptr gem=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - return (tbm_bo_handle) NULL; - } - bo_sprd->pBase = (void*)((uint32_t)arg.mapped); - } - - bo_handle.ptr = (void *)bo_sprd->pBase; - break; - case TBM_DEVICE_3D: + tbm_bo_handle bo_handle; + memset (&bo_handle, 0x0, sizeof (uint64_t)); + + switch (device) { + case TBM_DEVICE_DEFAULT: + case TBM_DEVICE_2D: + bo_handle.u32 = (uint32_t)bo_sprd->gem; + break; + case TBM_DEVICE_CPU: + if (!bo_sprd->pBase) { + struct drm_sprd_gem_mmap arg = {0,}; + + arg.handle = bo_sprd->gem; + arg.size = bo_sprd->size; + if (drmCommandWriteRead (bo_sprd->fd, DRM_SPRD_GEM_MMAP, &arg, sizeof(arg))) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot usrptr gem=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + return (tbm_bo_handle) NULL; + } + bo_sprd->pBase = (void *)((uint32_t)arg.mapped); + } + + bo_handle.ptr = (void *)bo_sprd->pBase; + break; + case TBM_DEVICE_3D: #ifdef USE_DMAIMPORT - if (!bo_sprd->dmabuf) - { - struct drm_prime_handle arg = {0, }; - arg.handle = bo_sprd->gem; - if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot dmabuf=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - return (tbm_bo_handle) NULL; - } - bo_sprd->dmabuf = arg.fd; - } - - bo_handle.u32 = (uint32_t)bo_sprd->dmabuf; + if (!bo_sprd->dmabuf) { + struct drm_prime_handle arg = {0, }; + arg.handle = bo_sprd->gem; + if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot dmabuf=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + return (tbm_bo_handle) NULL; + } + bo_sprd->dmabuf = arg.fd; + } + + bo_handle.u32 = (uint32_t)bo_sprd->dmabuf; #endif - break; + break; - case TBM_DEVICE_MM: + case TBM_DEVICE_MM: #ifdef USE_HEAP_ID - //TODO : Add ioctl for GSP MAP once available. - DBG ("[libtbm-sprd:%d] %s In case TBM_DEVICE_MM: \n", getpid(), - __FUNCTION_);_ + //TODO : Add ioctl for GSP MAP once available. + DBG ("[libtbm-sprd:%d] %s In case TBM_DEVICE_MM: \n", getpid(), + __FUNCTION_); + _ #else - if (!bo_sprd->dmabuf) - { - struct drm_prime_handle arg = {0, }; - - arg.handle = bo_sprd->gem; - if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot dmabuf=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - return (tbm_bo_handle) NULL; - } - bo_sprd->dmabuf = arg.fd; - } - - bo_handle.u32 = (uint32_t)bo_sprd->dmabuf; + if (!bo_sprd->dmabuf) { + struct drm_prime_handle arg = {0, }; + + arg.handle = bo_sprd->gem; + if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot dmabuf=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + return (tbm_bo_handle) NULL; + } + bo_sprd->dmabuf = arg.fd; + } + + bo_handle.u32 = (uint32_t)bo_sprd->dmabuf; #endif - break; - default: - bo_handle.ptr = (void *) NULL; - break; - } + break; + default: + bo_handle.ptr = (void *) NULL; + break; + } - return bo_handle; + return bo_handle; } static int tbm_sprd_bo_size (tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bo_sprd bo_sprd; + tbm_bo_sprd bo_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - return bo_sprd->size; + return bo_sprd->size; } static void * tbm_sprd_bo_alloc (tbm_bo bo, int size, int flags) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bo_sprd bo_sprd; - tbm_bufmgr_sprd bufmgr_sprd; - unsigned int sprd_flags; + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; + unsigned int sprd_flags; - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); - bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); - if (!bo_sprd) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fail to allocate the bo private\n", - getpid(), __FUNCTION__, __LINE__); - return 0; - } + bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); + if (!bo_sprd) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fail to allocate the bo private\n", + getpid(), __FUNCTION__, __LINE__); + return 0; + } #ifdef USE_CONTIG_ONLY - flags = TBM_BO_SCANOUT; - sprd_flags = SPRD_BO_CONTIG; + flags = TBM_BO_SCANOUT; + sprd_flags = SPRD_BO_CONTIG; #else - sprd_flags = _get_sprd_flag_from_tbm (flags); - if((flags & TBM_BO_SCANOUT) && - size <= 4*1024) - { - sprd_flags |= SPRD_BO_NONCONTIG; - } + sprd_flags = _get_sprd_flag_from_tbm (flags); + if ((flags & TBM_BO_SCANOUT) && + size <= 4 * 1024) { + sprd_flags |= SPRD_BO_NONCONTIG; + } #endif // USE_CONTIG_ONLY - struct drm_sprd_gem_create arg = {0, }; - arg.size = size; - arg.flags = sprd_flags; - if (drmCommandWriteRead(bufmgr_sprd->fd, DRM_SPRD_GEM_CREATE, &arg, sizeof(arg))) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot create bo(flag:%x, size:%d)\n", - getpid(), __FUNCTION__, __LINE__, arg.flags, (unsigned int)arg.size); - free (bo_sprd); - return 0; - } - - bo_sprd->fd = bufmgr_sprd->fd; - bo_sprd->gem = arg.handle; - bo_sprd->size = size; - bo_sprd->flags_tbm = flags; - bo_sprd->flags_sprd = sprd_flags; - bo_sprd->name = _get_name (bo_sprd->fd, bo_sprd->gem); - - if (!_bo_init_cache_state(bufmgr_sprd, bo_sprd)) - { - TBM_SPRD_LOG ("error fail init cache state(%d)\n", bo_sprd->name); - free (bo_sprd); - return 0; - } - - pthread_mutex_init(&bo_sprd->mutex, NULL); - - if (bufmgr_sprd->use_dma_fence - && !bo_sprd->dmabuf) - { - struct drm_prime_handle arg = {0, }; - - arg.handle = bo_sprd->gem; - if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot dmabuf=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - free (bo_sprd); - return 0; - } - bo_sprd->dmabuf = arg.fd; - } - - /* add bo to hash */ - PrivGem* privGem = calloc (1, sizeof(PrivGem)); - privGem->ref_count = 1; - privGem->bo_priv = bo_sprd; - if (drmHashInsert(bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot insert bo to Hash(%d)\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->name); - } - - DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), - __FUNCTION__, bo_sprd->size, - bo_sprd->gem, bo_sprd->name, - flags, sprd_flags); - - return (void *)bo_sprd; + struct drm_sprd_gem_create arg = {0, }; + arg.size = size; + arg.flags = sprd_flags; + if (drmCommandWriteRead(bufmgr_sprd->fd, DRM_SPRD_GEM_CREATE, &arg, + sizeof(arg))) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot create bo(flag:%x, size:%d)\n", + getpid(), __FUNCTION__, __LINE__, arg.flags, (unsigned int)arg.size); + free (bo_sprd); + return 0; + } + + bo_sprd->fd = bufmgr_sprd->fd; + bo_sprd->gem = arg.handle; + bo_sprd->size = size; + bo_sprd->flags_tbm = flags; + bo_sprd->flags_sprd = sprd_flags; + bo_sprd->name = _get_name (bo_sprd->fd, bo_sprd->gem); + + if (!_bo_init_cache_state(bufmgr_sprd, bo_sprd)) { + TBM_SPRD_LOG ("error fail init cache state(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } + + pthread_mutex_init(&bo_sprd->mutex, NULL); + + if (bufmgr_sprd->use_dma_fence + && !bo_sprd->dmabuf) { + struct drm_prime_handle arg = {0, }; + + arg.handle = bo_sprd->gem; + if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot dmabuf=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + free (bo_sprd); + return 0; + } + bo_sprd->dmabuf = arg.fd; + } + + /* add bo to hash */ + PrivGem *privGem = calloc (1, sizeof(PrivGem)); + privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; + if (drmHashInsert(bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot insert bo to Hash(%d)\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->name); + } + + DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), + __FUNCTION__, bo_sprd->size, + bo_sprd->gem, bo_sprd->name, + flags, sprd_flags); + + return (void *)bo_sprd; } static void tbm_sprd_bo_free(tbm_bo bo) { - tbm_bo_sprd bo_sprd; - tbm_bufmgr_sprd bufmgr_sprd; - - if (!bo) - return; - - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_IF_FAIL (bufmgr_sprd!=NULL); - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_IF_FAIL (bo_sprd!=NULL); - - DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d)\n", - getpid(), __FUNCTION__, bo_sprd->size, bo_sprd->gem, bo_sprd->name); - - if (bo_sprd->pBase) - { - if (munmap(bo_sprd->pBase, bo_sprd->size) == -1) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d\n", - getpid(), __FUNCTION__, __LINE__); - } - } - - /* close dmabuf */ - if (bo_sprd->dmabuf) - { - close (bo_sprd->dmabuf); - bo_sprd->dmabuf = 0; - } - - /* delete bo from hash */ - PrivGem *privGem = NULL; - int ret; - - ret = drmHashLookup (bufmgr_sprd->hashBos, bo_sprd->name, (void**)&privGem); - if (ret == 0) - { - privGem->ref_count--; - if (privGem->ref_count == 0) - { - drmHashDelete (bufmgr_sprd->hashBos, bo_sprd->name); - free (privGem); - privGem = NULL; - } - } - else - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "warning %s:%d Cannot find bo to Hash(%d), ret=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->name, ret); - } - - _bo_destroy_cache_state(bo); - - /* Free gem handle */ - struct drm_gem_close arg = {0, }; - memset (&arg, 0, sizeof(arg)); - arg.handle = bo_sprd->gem; - if (drmIoctl (bo_sprd->fd, DRM_IOCTL_GEM_CLOSE, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d\n", - getpid(), __FUNCTION__, __LINE__); - } - - free (bo_sprd); + tbm_bo_sprd bo_sprd; + tbm_bufmgr_sprd bufmgr_sprd; + + if (!bo) + return; + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_IF_FAIL (bufmgr_sprd != NULL); + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_IF_FAIL (bo_sprd != NULL); + + DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d)\n", + getpid(), __FUNCTION__, bo_sprd->size, bo_sprd->gem, bo_sprd->name); + + if (bo_sprd->pBase) { + if (munmap(bo_sprd->pBase, bo_sprd->size) == -1) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d\n", + getpid(), __FUNCTION__, __LINE__); + } + } + + /* close dmabuf */ + if (bo_sprd->dmabuf) { + close (bo_sprd->dmabuf); + bo_sprd->dmabuf = 0; + } + + /* delete bo from hash */ + PrivGem *privGem = NULL; + int ret; + + ret = drmHashLookup (bufmgr_sprd->hashBos, bo_sprd->name, (void **)&privGem); + if (ret == 0) { + privGem->ref_count--; + if (privGem->ref_count == 0) { + drmHashDelete (bufmgr_sprd->hashBos, bo_sprd->name); + free (privGem); + privGem = NULL; + } + } else { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "warning %s:%d Cannot find bo to Hash(%d), ret=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->name, ret); + } + + _bo_destroy_cache_state(bo); + + /* Free gem handle */ + struct drm_gem_close arg = {0, }; + memset (&arg, 0, sizeof(arg)); + arg.handle = bo_sprd->gem; + if (drmIoctl (bo_sprd->fd, DRM_IOCTL_GEM_CLOSE, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d\n", + getpid(), __FUNCTION__, __LINE__); + } + + free (bo_sprd); } static void * tbm_sprd_bo_import (tbm_bo bo, unsigned int key) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); - - tbm_bufmgr_sprd bufmgr_sprd; - tbm_bo_sprd bo_sprd; - PrivGem *privGem = NULL; - int ret; - - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); - - ret = drmHashLookup (bufmgr_sprd->hashBos, key, (void**)&privGem); - if (ret == 0) - { - privGem->ref_count++; - return privGem->bo_priv; - } - - struct drm_gem_open arg = {0, }; - struct drm_sprd_gem_info info = {0, }; - - arg.name = key; - if (drmIoctl(bufmgr_sprd->fd, DRM_IOCTL_GEM_OPEN, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot open gem name=%d\n", - getpid(), __FUNCTION__, __LINE__, key); - return 0; - } - - info.handle = arg.handle; - if (drmCommandWriteRead(bufmgr_sprd->fd, - DRM_SPRD_GEM_GET, - &info, - sizeof(struct drm_sprd_gem_info))) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot get gem info=%d\n", - getpid(), __FUNCTION__, __LINE__, key); - return 0; - } - - bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); - if (!bo_sprd) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fail to allocate the bo private\n", - getpid(), __FUNCTION__, __LINE__); - return 0; - } - - bo_sprd->fd = bufmgr_sprd->fd; - bo_sprd->gem = arg.handle; - bo_sprd->size = arg.size; - bo_sprd->flags_sprd = info.flags; - bo_sprd->name = key; + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); + + tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + PrivGem *privGem = NULL; + int ret; + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); + + ret = drmHashLookup (bufmgr_sprd->hashBos, key, (void **)&privGem); + if (ret == 0) { + privGem->ref_count++; + return privGem->bo_priv; + } + + struct drm_gem_open arg = {0, }; + struct drm_sprd_gem_info info = {0, }; + + arg.name = key; + if (drmIoctl(bufmgr_sprd->fd, DRM_IOCTL_GEM_OPEN, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot open gem name=%d\n", + getpid(), __FUNCTION__, __LINE__, key); + return 0; + } + + info.handle = arg.handle; + if (drmCommandWriteRead(bufmgr_sprd->fd, + DRM_SPRD_GEM_GET, + &info, + sizeof(struct drm_sprd_gem_info))) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot get gem info=%d\n", + getpid(), __FUNCTION__, __LINE__, key); + return 0; + } + + bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); + if (!bo_sprd) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fail to allocate the bo private\n", + getpid(), __FUNCTION__, __LINE__); + return 0; + } + + bo_sprd->fd = bufmgr_sprd->fd; + bo_sprd->gem = arg.handle; + bo_sprd->size = arg.size; + bo_sprd->flags_sprd = info.flags; + bo_sprd->name = key; #ifdef USE_CONTIG_ONLY - bo_sprd->flags_sprd = SPRD_BO_CONTIG; - bo_sprd->flags_tbm |= TBM_BO_SCANOUT; + bo_sprd->flags_sprd = SPRD_BO_CONTIG; + bo_sprd->flags_tbm |= TBM_BO_SCANOUT; #else - bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); + bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); #endif - if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) - { - TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); - free (bo_sprd); - return 0; - } - - if (!bo_sprd->dmabuf) - { - struct drm_prime_handle arg = {0, }; - - arg.handle = bo_sprd->gem; - if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot dmabuf=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - free (bo_sprd); - return 0; - } - bo_sprd->dmabuf = arg.fd; - } - - /* add bo to hash */ - privGem = calloc (1, sizeof(PrivGem)); - privGem->ref_count = 1; - privGem->bo_priv = bo_sprd; - if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot insert bo to Hash(%d)\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->name); - } - - DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), - __FUNCTION__, bo_sprd->size, - bo_sprd->gem, bo_sprd->name, - bo_sprd->flags_tbm, bo_sprd->flags_sprd); - - return (void *)bo_sprd; + if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) { + TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } + + if (!bo_sprd->dmabuf) { + struct drm_prime_handle arg = {0, }; + + arg.handle = bo_sprd->gem; + if (drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot dmabuf=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + free (bo_sprd); + return 0; + } + bo_sprd->dmabuf = arg.fd; + } + + /* add bo to hash */ + privGem = calloc (1, sizeof(PrivGem)); + privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; + if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot insert bo to Hash(%d)\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->name); + } + + DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), + __FUNCTION__, bo_sprd->size, + bo_sprd->gem, bo_sprd->name, + bo_sprd->flags_tbm, bo_sprd->flags_sprd); + + return (void *)bo_sprd; } static void * tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bufmgr_sprd bufmgr_sprd; - tbm_bo_sprd bo_sprd; - PrivGem *privGem = NULL; + tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + PrivGem *privGem = NULL; int ret; int name; - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); - //getting handle from fd - unsigned int gem = 0; - struct drm_prime_handle arg = {0, }; + //getting handle from fd + unsigned int gem = 0; + struct drm_prime_handle arg = {0, }; - arg.fd = key; - arg.flags = 0; - if (drmIoctl (bufmgr_sprd->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &arg)) - { - TBM_SPRD_LOG ("error bo:%p Cannot get gem handle from fd:%d (%s)\n", - bo, arg.fd, strerror(errno)); - return NULL; - } - gem = arg.handle; + arg.fd = key; + arg.flags = 0; + if (drmIoctl (bufmgr_sprd->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &arg)) { + TBM_SPRD_LOG ("error bo:%p Cannot get gem handle from fd:%d (%s)\n", + bo, arg.fd, strerror(errno)); + return NULL; + } + gem = arg.handle; name = _get_name (bufmgr_sprd->fd, gem); - ret = drmHashLookup (bufmgr_sprd->hashBos, name, (void**)&privGem); - if (ret == 0) - { - if (gem == privGem->bo_priv->gem) - { - privGem->ref_count++; - return privGem->bo_priv; - } - } - - unsigned int real_size = -1; - struct drm_sprd_gem_info info = {0, }; - - /* 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). */ - real_size = lseek(key, 0, SEEK_END); - - info.handle = gem; - if (drmCommandWriteRead(bufmgr_sprd->fd, - DRM_SPRD_GEM_GET, - &info, - sizeof(struct drm_sprd_gem_info))) - { - TBM_SPRD_LOG ("error bo:%p Cannot get gem info from gem:%d, fd:%d (%s)\n", - bo, gem, key, strerror(errno)); - return 0; - } - - if (real_size == -1) - real_size = info.size; - - bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); - if (!bo_sprd) - { - TBM_SPRD_LOG ("error bo:%p fail to allocate the bo private\n", bo); - return 0; - } - - bo_sprd->fd = bufmgr_sprd->fd; - bo_sprd->gem = gem; - bo_sprd->size = real_size; - bo_sprd->flags_sprd = info.flags; - bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); - - bo_sprd->name = name; - if (!bo_sprd->name) - { - TBM_SPRD_LOG ("error bo:%p Cannot get name from gem:%d, fd:%d (%s)\n", - bo, gem, key, strerror(errno)); - free (bo_sprd); - return 0; - } - - if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) - { - TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); - free (bo_sprd); - return 0; - } - - /* add bo to hash */ - privGem = NULL; - - privGem = calloc (1, sizeof(PrivGem)); - if (!privGem) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Fail to calloc privGem\n", - getpid(), __FUNCTION__, __LINE__); - free (bo_sprd); - return 0; - } - - privGem->ref_count = 1; - privGem->bo_priv = bo_sprd; - if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) - { - TBM_SPRD_LOG ("error bo:%p Cannot insert bo to Hash(%d) from gem:%d, fd:%d\n", - bo, bo_sprd->name, gem, key); - } - - DBG (" [%s] bo:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d(%d), size:%d\n", target_name(), - bo, - bo_sprd->gem, bo_sprd->name, - bo_sprd->dmabuf, - key, - bo_sprd->flags_tbm, bo_sprd->flags_sprd, - bo_sprd->size); - - return (void *)bo_sprd; + ret = drmHashLookup (bufmgr_sprd->hashBos, name, (void **)&privGem); + if (ret == 0) { + if (gem == privGem->bo_priv->gem) { + privGem->ref_count++; + return privGem->bo_priv; + } + } + + unsigned int real_size = -1; + struct drm_sprd_gem_info info = {0, }; + + /* 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). */ + real_size = lseek(key, 0, SEEK_END); + + info.handle = gem; + if (drmCommandWriteRead(bufmgr_sprd->fd, + DRM_SPRD_GEM_GET, + &info, + sizeof(struct drm_sprd_gem_info))) { + TBM_SPRD_LOG ("error bo:%p Cannot get gem info from gem:%d, fd:%d (%s)\n", + bo, gem, key, strerror(errno)); + return 0; + } + + if (real_size == -1) + real_size = info.size; + + bo_sprd = calloc (1, sizeof(struct _tbm_bo_sprd)); + if (!bo_sprd) { + TBM_SPRD_LOG ("error bo:%p fail to allocate the bo private\n", bo); + return 0; + } + + bo_sprd->fd = bufmgr_sprd->fd; + bo_sprd->gem = gem; + bo_sprd->size = real_size; + bo_sprd->flags_sprd = info.flags; + bo_sprd->flags_tbm = _get_tbm_flag_from_sprd (bo_sprd->flags_sprd); + + bo_sprd->name = name; + if (!bo_sprd->name) { + TBM_SPRD_LOG ("error bo:%p Cannot get name from gem:%d, fd:%d (%s)\n", + bo, gem, key, strerror(errno)); + free (bo_sprd); + return 0; + } + + if (!_tgl_init(bufmgr_sprd->tgl_fd, bo_sprd->name)) { + TBM_SPRD_LOG ("error fail tgl init(%d)\n", bo_sprd->name); + free (bo_sprd); + return 0; + } + + /* add bo to hash */ + privGem = NULL; + + privGem = calloc (1, sizeof(PrivGem)); + if (!privGem) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Fail to calloc privGem\n", + getpid(), __FUNCTION__, __LINE__); + free (bo_sprd); + return 0; + } + + privGem->ref_count = 1; + privGem->bo_priv = bo_sprd; + if (drmHashInsert (bufmgr_sprd->hashBos, bo_sprd->name, (void *)privGem) < 0) { + TBM_SPRD_LOG ("error bo:%p Cannot insert bo to Hash(%d) from gem:%d, fd:%d\n", + bo, bo_sprd->name, gem, key); + } + + DBG (" [%s] bo:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d(%d), size:%d\n", + target_name(), + bo, + bo_sprd->gem, bo_sprd->name, + bo_sprd->dmabuf, + key, + bo_sprd->flags_tbm, bo_sprd->flags_sprd, + bo_sprd->size); + + return (void *)bo_sprd; } static unsigned int tbm_sprd_bo_export (tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); - - tbm_bo_sprd bo_sprd; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - - if (!bo_sprd->name) - { - bo_sprd->name = _get_name(bo_sprd->fd, bo_sprd->gem); - if (!bo_sprd->name) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot get name\n", - getpid(), __FUNCTION__, __LINE__); - return 0; - } - } - - DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), - __FUNCTION__, bo_sprd->size, - bo_sprd->gem, bo_sprd->name, - bo_sprd->flags_tbm, bo_sprd->flags_sprd); - - return (unsigned int)bo_sprd->name; + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); + + tbm_bo_sprd bo_sprd; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + + if (!bo_sprd->name) { + bo_sprd->name = _get_name(bo_sprd->fd, bo_sprd->gem); + if (!bo_sprd->name) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot get name\n", + getpid(), __FUNCTION__, __LINE__); + return 0; + } + } + + DBG ("[libtbm-sprd:%d] %s size:%d, gem:%d(%d), flags:%d(%d)\n", getpid(), + __FUNCTION__, bo_sprd->size, + bo_sprd->gem, bo_sprd->name, + bo_sprd->flags_tbm, bo_sprd->flags_sprd); + + return (unsigned int)bo_sprd->name; } tbm_fd tbm_sprd_bo_export_fd (tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, -1); - - tbm_bo_sprd bo_sprd; - int ret; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, -1); - - struct drm_prime_handle arg = {0, }; - - arg.handle = bo_sprd->gem; - ret = drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg); - if (ret) - { - TBM_SPRD_LOG ("error bo:%p Cannot dmabuf=%d (%s)\n", - bo, bo_sprd->gem, strerror(errno)); - return (tbm_fd) ret; - } - - DBG (" [%s] bo:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d(%d), size:%d\n", target_name(), - bo, - bo_sprd->gem, bo_sprd->name, - bo_sprd->dmabuf, - arg.fd, - bo_sprd->flags_tbm, bo_sprd->flags_sprd, - bo_sprd->size); - - return (tbm_fd)arg.fd; + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, -1); + + tbm_bo_sprd bo_sprd; + int ret; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, -1); + + struct drm_prime_handle arg = {0, }; + + arg.handle = bo_sprd->gem; + ret = drmIoctl (bo_sprd->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg); + if (ret) { + TBM_SPRD_LOG ("error bo:%p Cannot dmabuf=%d (%s)\n", + bo, bo_sprd->gem, strerror(errno)); + return (tbm_fd) ret; + } + + DBG (" [%s] bo:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d(%d), size:%d\n", + target_name(), + bo, + bo_sprd->gem, bo_sprd->name, + bo_sprd->dmabuf, + arg.fd, + bo_sprd->flags_tbm, bo_sprd->flags_sprd, + bo_sprd->size); + + return (tbm_fd)arg.fd; } static tbm_bo_handle tbm_sprd_bo_get_handle (tbm_bo bo, int device) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, (tbm_bo_handle) NULL); - - tbm_bo_handle bo_handle; - tbm_bo_sprd bo_sprd; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, (tbm_bo_handle) NULL); - - if (!bo_sprd->gem) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot map gem=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - return (tbm_bo_handle) NULL; - } - - DBG ("[libtbm-sprd:%d] %s gem:%d(%d), %s\n", getpid(), - __FUNCTION__, bo_sprd->gem, bo_sprd->name, STR_DEVICE[device]); - - /*Get mapped bo_handle*/ - bo_handle = _sprd_bo_handle (bo_sprd, device); - if (bo_handle.ptr == NULL) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot get handle: gem:%d, device:%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem, device); - return (tbm_bo_handle) NULL; - } - - return bo_handle; + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, (tbm_bo_handle) NULL); + + tbm_bo_handle bo_handle; + tbm_bo_sprd bo_sprd; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, (tbm_bo_handle) NULL); + + if (!bo_sprd->gem) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot map gem=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + return (tbm_bo_handle) NULL; + } + + DBG ("[libtbm-sprd:%d] %s gem:%d(%d), %s\n", getpid(), + __FUNCTION__, bo_sprd->gem, bo_sprd->name, STR_DEVICE[device]); + + /*Get mapped bo_handle*/ + bo_handle = _sprd_bo_handle (bo_sprd, device); + if (bo_handle.ptr == NULL) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot get handle: gem:%d, device:%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem, device); + return (tbm_bo_handle) NULL; + } + + return bo_handle; } static tbm_bo_handle tbm_sprd_bo_map (tbm_bo bo, int device, int opt) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, (tbm_bo_handle) NULL); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, (tbm_bo_handle) NULL); - tbm_bo_handle bo_handle; - tbm_bo_sprd bo_sprd; + tbm_bo_handle bo_handle; + tbm_bo_sprd bo_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, (tbm_bo_handle) NULL); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, (tbm_bo_handle) NULL); - if (!bo_sprd->gem) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot map gem=%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); - return (tbm_bo_handle) NULL; - } + if (!bo_sprd->gem) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot map gem=%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem); + return (tbm_bo_handle) NULL; + } - DBG ("[libtbm-sprd:%d] %s gem:%d(%d), %s, %s\n", getpid(), - __FUNCTION__, bo_sprd->gem, bo_sprd->name, STR_DEVICE[device], STR_OPT[opt]); + DBG ("[libtbm-sprd:%d] %s gem:%d(%d), %s, %s\n", getpid(), + __FUNCTION__, bo_sprd->gem, bo_sprd->name, STR_DEVICE[device], STR_OPT[opt]); - /*Get mapped bo_handle*/ - bo_handle = _sprd_bo_handle (bo_sprd, device); - if (bo_handle.ptr == NULL) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Cannot get handle: gem:%d, device:%d, opt:%d\n", - getpid(), __FUNCTION__, __LINE__, bo_sprd->gem, device, opt); - return (tbm_bo_handle) NULL; - } + /*Get mapped bo_handle*/ + bo_handle = _sprd_bo_handle (bo_sprd, device); + if (bo_handle.ptr == NULL) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Cannot get handle: gem:%d, device:%d, opt:%d\n", + getpid(), __FUNCTION__, __LINE__, bo_sprd->gem, device, opt); + return (tbm_bo_handle) NULL; + } - if (bo_sprd->map_cnt == 0) - _bo_set_cache_state (bo, device, opt); + if (bo_sprd->map_cnt == 0) + _bo_set_cache_state (bo, device, opt); - bo_sprd->map_cnt++; + bo_sprd->map_cnt++; - return bo_handle; + return bo_handle; } static int tbm_sprd_bo_unmap (tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bo_sprd bo_sprd; + tbm_bo_sprd bo_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); - if (!bo_sprd->gem) - return 0; + if (!bo_sprd->gem) + return 0; - bo_sprd->map_cnt--; + bo_sprd->map_cnt--; - if (bo_sprd->map_cnt == 0) - _bo_save_cache_state (bo); + if (bo_sprd->map_cnt == 0) + _bo_save_cache_state (bo); - DBG ("[libtbm-sprd:%d] %s gem:%d(%d) \n", getpid(), - __FUNCTION__, bo_sprd->gem, bo_sprd->name); + DBG ("[libtbm-sprd:%d] %s gem:%d(%d) \n", getpid(), + __FUNCTION__, bo_sprd->gem, bo_sprd->name); - return 1; + return 1; } static int tbm_sprd_bo_lock(tbm_bo bo, int device, int opt) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); #if USE_BACKEND_LOCK - tbm_bufmgr_sprd bufmgr_sprd; - tbm_bo_sprd bo_sprd; - struct dma_buf_fence fence; - int ret=0; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - - bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd!=NULL, 0); - - memset(&fence, 0, sizeof(struct dma_buf_fence)); - - /* Check if the given type is valid or not. */ - if (opt & TBM_OPTION_WRITE) - { - if (device == TBM_DEVICE_CPU) - fence.type = DMA_BUF_ACCESS_WRITE; - else if (device == TBM_DEVICE_3D) - fence.type = DMA_BUF_ACCESS_WRITE | DMA_BUF_ACCESS_DMA; - else - { - DBG ("[libtbm-sprd:%d] %s GET_FENCE is ignored(device type is not 3D/CPU),\n", getpid(), __FUNCTION__); - return 0; - } - } - else if (opt & TBM_OPTION_READ) - { - if (device == TBM_DEVICE_CPU) - fence.type = DMA_BUF_ACCESS_READ; - else if (device == TBM_DEVICE_3D) - fence.type = DMA_BUF_ACCESS_READ | DMA_BUF_ACCESS_DMA; - else - { - DBG ("[libtbm-sprd:%d] %s GET_FENCE is ignored(device type is not 3D/CPU),\n", getpid(), __FUNCTION__); - return 0; - } - } - else - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] error %s:%d Invalid argument\n", getpid(), __FUNCTION__, __LINE__); - return 0; - } - - /* Check if the tbm manager supports dma fence or not. */ - if (!bufmgr_sprd->use_dma_fence) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Not support DMA FENCE(%s)\n", - getpid(), __FUNCTION__, __LINE__, strerror(errno) ); - return 0; - - } - - ret = ioctl(bo_sprd->dmabuf, DMABUF_IOCTL_GET_FENCE, &fence); - if (ret < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Can not set GET FENCE(%s)\n", - getpid(), __FUNCTION__, __LINE__, strerror(errno) ); - return 0; - } - - pthread_mutex_lock(&bo_sprd->mutex); - int i; - for (i = 0; i < DMA_FENCE_LIST_MAX; i++) - { - if (bo_sprd->dma_fence[i].ctx == 0) - { - bo_sprd->dma_fence[i].type = fence.type; - bo_sprd->dma_fence[i].ctx = fence.ctx; - break; - } - } - if (i == DMA_FENCE_LIST_MAX) - { - //TODO: if dma_fence list is full, it needs realloc. I will fix this. by minseok3.kim - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d fence list is full\n", - getpid(), __FUNCTION__, __LINE__); - } - pthread_mutex_unlock(&bo_sprd->mutex); - - DBG ("[libtbm-sprd:%d] %s DMABUF_IOCTL_GET_FENCE! flink_id=%d dmabuf=%d\n", getpid(), - __FUNCTION__, bo_sprd->name, bo_sprd->dmabuf); + tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + int ret = 0; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); + + if (bufmgr_sprd->use_dma_fence) { + struct dma_buf_fence fence; + + memset(&fence, 0, sizeof(struct dma_buf_fence)); + + /* Check if the given type is valid or not. */ + if (opt & TBM_OPTION_WRITE) { + if (device == TBM_DEVICE_CPU) + fence.type = DMA_BUF_ACCESS_WRITE; + else if (device == TBM_DEVICE_3D) + fence.type = DMA_BUF_ACCESS_WRITE | DMA_BUF_ACCESS_DMA; + else { + DBG ("[libtbm-sprd:%d] %s GET_FENCE is ignored(device type is not 3D/CPU),\n", + getpid(), __FUNCTION__); + return 0; + } + } else if (opt & TBM_OPTION_READ) { + if (device == TBM_DEVICE_CPU) + fence.type = DMA_BUF_ACCESS_READ; + else if (device == TBM_DEVICE_3D) + fence.type = DMA_BUF_ACCESS_READ | DMA_BUF_ACCESS_DMA; + else { + DBG ("[libtbm-sprd:%d] %s GET_FENCE is ignored(device type is not 3D/CPU),\n", + getpid(), __FUNCTION__); + return 0; + } + } else { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error %s:%d Invalid argument\n", getpid(), + __FUNCTION__, __LINE__); + return 0; + } + + /* Check if the tbm manager supports dma fence or not. */ + if (!bufmgr_sprd->use_dma_fence) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Not support DMA FENCE(%s)\n", + getpid(), __FUNCTION__, __LINE__, strerror(errno) ); + return 0; + + } + + ret = ioctl(bo_sprd->dmabuf, DMABUF_IOCTL_GET_FENCE, &fence); + if (ret < 0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Can not set GET FENCE(%s)\n", + getpid(), __FUNCTION__, __LINE__, strerror(errno) ); + return 0; + } + + pthread_mutex_lock(&bo_sprd->mutex); + int i; + for (i = 0; i < DMA_FENCE_LIST_MAX; i++) { + if (bo_sprd->dma_fence[i].ctx == 0) { + bo_sprd->dma_fence[i].type = fence.type; + bo_sprd->dma_fence[i].ctx = fence.ctx; + break; + } + } + if (i == DMA_FENCE_LIST_MAX) { + //TODO: if dma_fence list is full, it needs realloc. I will fix this. by minseok3.kim + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d fence list is full\n", + getpid(), __FUNCTION__, __LINE__); + } + pthread_mutex_unlock(&bo_sprd->mutex); + + DBG ("[libtbm-sprd:%d] %s DMABUF_IOCTL_GET_FENCE! flink_id=%d dmabuf=%d\n", + getpid(), + __FUNCTION__, bo_sprd->name, bo_sprd->dmabuf); + } else { + ret = _tgl_lock(bufmgr_sprd->tgl_fd, bo_sprd->name); + + DBG ("[libtbm-sprd:%d] lock tgl flink_id:%d\n", + getpid(), __FUNCTION__, bo_sprd->name); + + return ret; + } #endif - return 1; + return 1; } static int tbm_sprd_bo_unlock(tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo!=NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); #if USE_BACKEND_LOCK - tbm_bo_sprd bo_sprd; - struct dma_buf_fence fence; - int ret=0; - - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd!=NULL, 0); - - if (!bo_sprd->dma_fence[0].ctx) - { - DBG ("[libtbm-sprd:%d] %s FENCE not support or ignored,\n", getpid(), __FUNCTION__); - return 0; - } - - if (!bo_sprd->dma_fence[0].type) - { - DBG ("[libtbm-sprd:%d] %s device type is not 3D/CPU,\n", getpid(), __FUNCTION__); - return 0; - } - - pthread_mutex_lock(&bo_sprd->mutex); - fence.type = bo_sprd->dma_fence[0].type; - fence.ctx = bo_sprd->dma_fence[0].ctx; - int i; - for (i = 1; i < DMA_FENCE_LIST_MAX; i++) - { - bo_sprd->dma_fence[i-1].type = bo_sprd->dma_fence[i].type; - bo_sprd->dma_fence[i-1].ctx = bo_sprd->dma_fence[i].ctx; - } - bo_sprd->dma_fence[DMA_FENCE_LIST_MAX-1].type = 0; - bo_sprd->dma_fence[DMA_FENCE_LIST_MAX-1].ctx = 0; - pthread_mutex_unlock(&bo_sprd->mutex); - - ret = ioctl(bo_sprd->dmabuf, DMABUF_IOCTL_PUT_FENCE, &fence); - if (ret < 0) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] " - "error %s:%d Can not set PUT FENCE(%s)\n", - getpid(), __FUNCTION__, __LINE__, strerror(errno) ); - return 0; - } - - DBG ("[libtbm-sprd:%d] %s DMABUF_IOCTL_PUT_FENCE! flink_id=%d dmabuf=%d\n", getpid(), - __FUNCTION__, bo_sprd->name, bo_sprd->dmabuf); + tbm_bufmgr_sprd bufmgr_sprd; + tbm_bo_sprd bo_sprd; + int ret = 0; + + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + + bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); + + if (bufmgr_sprd->use_dma_fence) { + struct dma_buf_fence fence; + + if (!bo_sprd->dma_fence[0].ctx) { + DBG ("[libtbm-sprd:%d] %s FENCE not support or ignored,\n", getpid(), + __FUNCTION__); + return 0; + } + + if (!bo_sprd->dma_fence[0].type) { + DBG ("[libtbm-sprd:%d] %s device type is not 3D/CPU,\n", getpid(), + __FUNCTION__); + return 0; + } + + pthread_mutex_lock(&bo_sprd->mutex); + fence.type = bo_sprd->dma_fence[0].type; + fence.ctx = bo_sprd->dma_fence[0].ctx; + int i; + for (i = 1; i < DMA_FENCE_LIST_MAX; i++) { + bo_sprd->dma_fence[i - 1].type = bo_sprd->dma_fence[i].type; + bo_sprd->dma_fence[i - 1].ctx = bo_sprd->dma_fence[i].ctx; + } + bo_sprd->dma_fence[DMA_FENCE_LIST_MAX - 1].type = 0; + bo_sprd->dma_fence[DMA_FENCE_LIST_MAX - 1].ctx = 0; + pthread_mutex_unlock(&bo_sprd->mutex); + + ret = ioctl(bo_sprd->dmabuf, DMABUF_IOCTL_PUT_FENCE, &fence); + if (ret < 0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "error %s:%d Can not set PUT FENCE(%s)\n", + getpid(), __FUNCTION__, __LINE__, strerror(errno) ); + return 0; + } + + DBG ("[libtbm-sprd:%d] %s DMABUF_IOCTL_PUT_FENCE! flink_id=%d dmabuf=%d\n", + getpid(), + __FUNCTION__, bo_sprd->name, bo_sprd->dmabuf); + } else { + ret = _tgl_unlock(bufmgr_sprd->tgl_fd, bo_sprd->name); + + DBG ("[libtbm-sprd:%d] unlock tgl flink_id:%d\n", + getpid(), __FUNCTION__, bo_sprd->name); + return ret; + } #endif - return 1; + return 1; } static void tbm_sprd_bufmgr_deinit (void *priv) { - SPRD_RETURN_IF_FAIL (priv!=NULL); + SPRD_RETURN_IF_FAIL (priv != NULL); - tbm_bufmgr_sprd bufmgr_sprd; + tbm_bufmgr_sprd bufmgr_sprd; - bufmgr_sprd = (tbm_bufmgr_sprd)priv; + bufmgr_sprd = (tbm_bufmgr_sprd)priv; - if (bufmgr_sprd->hashBos) - { - unsigned long key; - void *value; + if (bufmgr_sprd->hashBos) { + unsigned long key; + void *value; - while (drmHashFirst(bufmgr_sprd->hashBos, &key, &value) > 0) - { - free (value); - drmHashDelete (bufmgr_sprd->hashBos, key); - } + while (drmHashFirst(bufmgr_sprd->hashBos, &key, &value) > 0) { + free (value); + drmHashDelete (bufmgr_sprd->hashBos, key); + } - drmHashDestroy (bufmgr_sprd->hashBos); - bufmgr_sprd->hashBos = NULL; - } + drmHashDestroy (bufmgr_sprd->hashBos); + bufmgr_sprd->hashBos = NULL; + } - close (bufmgr_sprd->tgl_fd); + close (bufmgr_sprd->tgl_fd); - if (bufmgr_sprd->bind_display) - tbm_drm_helper_wl_server_deinit(); + if (bufmgr_sprd->bind_display) + tbm_drm_helper_wl_server_deinit(); - free (bufmgr_sprd); + free (bufmgr_sprd); } int tbm_sprd_surface_supported_format(uint32_t **formats, uint32_t *num) { - uint32_t* color_formats=NULL; + uint32_t *color_formats = NULL; - color_formats = (uint32_t*)calloc (1,sizeof(uint32_t)*TBM_COLOR_FORMAT_COUNT); + color_formats = (uint32_t *)calloc (1, + sizeof(uint32_t) * TBM_COLOR_FORMAT_COUNT); - if( color_formats == NULL ) - { - return 0; - } - memcpy( color_formats, tbm_sprd_color_format_list , sizeof(uint32_t)*TBM_COLOR_FORMAT_COUNT ); + if ( color_formats == NULL ) { + return 0; + } + memcpy( color_formats, tbm_sprd_color_format_list , + sizeof(uint32_t)*TBM_COLOR_FORMAT_COUNT ); - *formats = color_formats; - *num = TBM_COLOR_FORMAT_COUNT; + *formats = color_formats; + *num = TBM_COLOR_FORMAT_COUNT; - return 1; + return 1; } @@ -1477,256 +1471,254 @@ tbm_sprd_surface_supported_format(uint32_t **formats, uint32_t *num) * @return 1 if this function succeeds, otherwise 0. */ int -tbm_sprd_surface_get_plane_data(tbm_surface_h surface, int width, int height, tbm_format format, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx) +tbm_sprd_surface_get_plane_data(tbm_surface_h surface, int width, int height, + tbm_format format, int plane_idx, uint32_t *size, uint32_t *offset, + uint32_t *pitch, int *bo_idx) { - int ret = 1; - int bpp; - int _offset =0; - int _pitch =0; - int _size =0; - int _bo_idx = 0; - - switch(format) - { - /* 16 bpp RGB */ - case TBM_FORMAT_XRGB4444: - case TBM_FORMAT_XBGR4444: - case TBM_FORMAT_RGBX4444: - case TBM_FORMAT_BGRX4444: - case TBM_FORMAT_ARGB4444: - case TBM_FORMAT_ABGR4444: - case TBM_FORMAT_RGBA4444: - case TBM_FORMAT_BGRA4444: - case TBM_FORMAT_XRGB1555: - case TBM_FORMAT_XBGR1555: - case TBM_FORMAT_RGBX5551: - case TBM_FORMAT_BGRX5551: - case TBM_FORMAT_ARGB1555: - case TBM_FORMAT_ABGR1555: - case TBM_FORMAT_RGBA5551: - case TBM_FORMAT_BGRA5551: - case TBM_FORMAT_RGB565: - bpp = 16; - _offset = 0; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - break; - /* 24 bpp RGB */ - case TBM_FORMAT_RGB888: - case TBM_FORMAT_BGR888: - bpp = 24; - _offset = 0; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - break; - /* 32 bpp RGB */ - case TBM_FORMAT_XRGB8888: - case TBM_FORMAT_XBGR8888: - case TBM_FORMAT_RGBX8888: - case TBM_FORMAT_BGRX8888: - case TBM_FORMAT_ARGB8888: - case TBM_FORMAT_ABGR8888: - case TBM_FORMAT_RGBA8888: - case TBM_FORMAT_BGRA8888: - bpp = 32; - _offset = 0; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_RGB); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - break; - - /* packed YCbCr */ - case TBM_FORMAT_YUYV: - case TBM_FORMAT_YVYU: - case TBM_FORMAT_UYVY: - case TBM_FORMAT_VYUY: - case TBM_FORMAT_AYUV: - bpp = 32; - _offset = 0; - _pitch = SIZE_ALIGN((width*bpp)>>3,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - break; - - /* - * 2 plane YCbCr - * index 0 = Y plane, [7:0] Y - * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian - * or - * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian - */ - case TBM_FORMAT_NV12: - case TBM_FORMAT_NV21: - bpp = 12; - if(plane_idx == 0) - { - _offset = 0; - _pitch = SIZE_ALIGN( width ,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - else if( plane_idx ==1 ) - { - _offset = width*height; - _pitch = SIZE_ALIGN( width ,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - break; - - case TBM_FORMAT_NV16: - case TBM_FORMAT_NV61: - bpp = 16; - //if(plane_idx == 0) - { - _offset = 0; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 0) - break; - } - //else if( plane_idx ==1 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - break; - - /* - * 3 plane YCbCr - * index 0: Y plane, [7:0] Y - * index 1: Cb plane, [7:0] Cb - * index 2: Cr plane, [7:0] Cr - * or - * index 1: Cr plane, [7:0] Cr - * index 2: Cb plane, [7:0] Cb - */ - /* - NATIVE_BUFFER_FORMAT_YV12 - NATIVE_BUFFER_FORMAT_I420 - */ - case TBM_FORMAT_YUV410: - case TBM_FORMAT_YVU410: - bpp = 9; - break; - case TBM_FORMAT_YUV411: - case TBM_FORMAT_YVU411: - case TBM_FORMAT_YUV420: - case TBM_FORMAT_YVU420: - bpp = 12; - //if(plane_idx == 0) - { - _offset = 0; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 0) - break; - } - //else if( plane_idx == 1 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 1) - break; - } - //else if (plane_idx == 2 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*(height/2),TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - break; - case TBM_FORMAT_YUV422: - case TBM_FORMAT_YVU422: - bpp = 16; - //if(plane_idx == 0) - { - _offset = 0; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 0) - break; - } - //else if( plane_idx == 1 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*(height),TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 1) - break; - } - //else if (plane_idx == 2 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width/2,TBM_SURFACE_ALIGNMENT_PITCH_YUV/2); - _size = SIZE_ALIGN(_pitch*(height),TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - break; - case TBM_FORMAT_YUV444: - case TBM_FORMAT_YVU444: - bpp = 24; - //if(plane_idx == 0) - { - _offset = 0; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 0) - break; - } - //else if( plane_idx == 1 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - if(plane_idx == 1) - break; - } - //else if (plane_idx == 2 ) - { - _offset += _size; - _pitch = SIZE_ALIGN(width,TBM_SURFACE_ALIGNMENT_PITCH_YUV); - _size = SIZE_ALIGN(_pitch*height,TBM_SURFACE_ALIGNMENT_PLANE); - _bo_idx = 0; - } - break; - default: - bpp = 0; - break; - } - - *size = _size; - *offset = _offset; - *pitch = _pitch; - *bo_idx = _bo_idx; - - return ret; + int ret = 1; + int bpp; + int _offset = 0; + int _pitch = 0; + int _size = 0; + int _bo_idx = 0; + + switch (format) { + /* 16 bpp RGB */ + case TBM_FORMAT_XRGB4444: + case TBM_FORMAT_XBGR4444: + case TBM_FORMAT_RGBX4444: + case TBM_FORMAT_BGRX4444: + case TBM_FORMAT_ARGB4444: + case TBM_FORMAT_ABGR4444: + case TBM_FORMAT_RGBA4444: + case TBM_FORMAT_BGRA4444: + case TBM_FORMAT_XRGB1555: + case TBM_FORMAT_XBGR1555: + case TBM_FORMAT_RGBX5551: + case TBM_FORMAT_BGRX5551: + case TBM_FORMAT_ARGB1555: + case TBM_FORMAT_ABGR1555: + case TBM_FORMAT_RGBA5551: + case TBM_FORMAT_BGRA5551: + case TBM_FORMAT_RGB565: + bpp = 16; + _offset = 0; + _pitch = SIZE_ALIGN((width * bpp) >> 3, TBM_SURFACE_ALIGNMENT_PITCH_RGB); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + break; + /* 24 bpp RGB */ + case TBM_FORMAT_RGB888: + case TBM_FORMAT_BGR888: + bpp = 24; + _offset = 0; + _pitch = SIZE_ALIGN((width * bpp) >> 3, TBM_SURFACE_ALIGNMENT_PITCH_RGB); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + break; + /* 32 bpp RGB */ + case TBM_FORMAT_XRGB8888: + case TBM_FORMAT_XBGR8888: + case TBM_FORMAT_RGBX8888: + case TBM_FORMAT_BGRX8888: + case TBM_FORMAT_ARGB8888: + case TBM_FORMAT_ABGR8888: + case TBM_FORMAT_RGBA8888: + case TBM_FORMAT_BGRA8888: + bpp = 32; + _offset = 0; + _pitch = SIZE_ALIGN((width * bpp) >> 3, TBM_SURFACE_ALIGNMENT_PITCH_RGB); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + break; + + /* packed YCbCr */ + case TBM_FORMAT_YUYV: + case TBM_FORMAT_YVYU: + case TBM_FORMAT_UYVY: + case TBM_FORMAT_VYUY: + case TBM_FORMAT_AYUV: + bpp = 32; + _offset = 0; + _pitch = SIZE_ALIGN((width * bpp) >> 3, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + break; + + /* + * 2 plane YCbCr + * index 0 = Y plane, [7:0] Y + * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian + * or + * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian + */ + case TBM_FORMAT_NV12: + case TBM_FORMAT_NV21: + bpp = 12; + if (plane_idx == 0) { + _offset = 0; + _pitch = SIZE_ALIGN( width , TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } else if ( plane_idx == 1 ) { + _offset = width * height; + _pitch = SIZE_ALIGN( width , TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * (height / 2), TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } + break; + + case TBM_FORMAT_NV16: + case TBM_FORMAT_NV61: + bpp = 16; + //if(plane_idx == 0) + { + _offset = 0; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 0) + break; + } + //else if( plane_idx ==1 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } + break; + + /* + * 3 plane YCbCr + * index 0: Y plane, [7:0] Y + * index 1: Cb plane, [7:0] Cb + * index 2: Cr plane, [7:0] Cr + * or + * index 1: Cr plane, [7:0] Cr + * index 2: Cb plane, [7:0] Cb + */ + /* + NATIVE_BUFFER_FORMAT_YV12 + NATIVE_BUFFER_FORMAT_I420 + */ + case TBM_FORMAT_YUV410: + case TBM_FORMAT_YVU410: + bpp = 9; + break; + case TBM_FORMAT_YUV411: + case TBM_FORMAT_YVU411: + case TBM_FORMAT_YUV420: + case TBM_FORMAT_YVU420: + bpp = 12; + //if(plane_idx == 0) + { + _offset = 0; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 0) + break; + } + //else if( plane_idx == 1 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width / 2, TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * (height / 2), TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 1) + break; + } + //else if (plane_idx == 2 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width / 2, TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * (height / 2), TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } + break; + case TBM_FORMAT_YUV422: + case TBM_FORMAT_YVU422: + bpp = 16; + //if(plane_idx == 0) + { + _offset = 0; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 0) + break; + } + //else if( plane_idx == 1 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width / 2, TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * (height), TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 1) + break; + } + //else if (plane_idx == 2 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width / 2, TBM_SURFACE_ALIGNMENT_PITCH_YUV / 2); + _size = SIZE_ALIGN(_pitch * (height), TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } + break; + case TBM_FORMAT_YUV444: + case TBM_FORMAT_YVU444: + bpp = 24; + //if(plane_idx == 0) + { + _offset = 0; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 0) + break; + } + //else if( plane_idx == 1 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + if (plane_idx == 1) + break; + } + //else if (plane_idx == 2 ) + { + _offset += _size; + _pitch = SIZE_ALIGN(width, TBM_SURFACE_ALIGNMENT_PITCH_YUV); + _size = SIZE_ALIGN(_pitch * height, TBM_SURFACE_ALIGNMENT_PLANE); + _bo_idx = 0; + } + break; + default: + bpp = 0; + break; + } + + *size = _size; + *offset = _offset; + *pitch = _pitch; + *bo_idx = _bo_idx; + + return ret; } int tbm_sprd_bo_get_flags (tbm_bo bo) { - SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); + SPRD_RETURN_VAL_IF_FAIL (bo != NULL, 0); - tbm_bo_sprd bo_sprd; + tbm_bo_sprd bo_sprd; - bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); - SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); + bo_sprd = (tbm_bo_sprd)tbm_backend_get_bo_priv(bo); + SPRD_RETURN_VAL_IF_FAIL (bo_sprd != NULL, 0); - return bo_sprd->flags_tbm; + return bo_sprd->flags_tbm; } int @@ -1737,7 +1729,8 @@ tbm_sprd_bufmgr_bind_native_display (tbm_bufmgr bufmgr, void *NativeDisplay) bufmgr_sprd = tbm_backend_get_priv_from_bufmgr(bufmgr); SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0); - if (!tbm_drm_helper_wl_server_init(NativeDisplay, bufmgr_sprd->fd, "/dev/dri/card0", 0)) { + if (!tbm_drm_helper_wl_server_init(NativeDisplay, bufmgr_sprd->fd, + "/dev/dri/card0", 0)) { TBM_SPRD_LOG("[libtbm-sprd:%d] error:Fail to tbm_drm_helper_wl_server_init\n"); return 0; } @@ -1749,11 +1742,10 @@ tbm_sprd_bufmgr_bind_native_display (tbm_bufmgr bufmgr, void *NativeDisplay) MODULEINITPPROTO (init_tbm_bufmgr_priv); -static TBMModuleVersionInfo SprdVersRec = -{ - "sprd", - "Samsung", - TBM_ABI_VERSION, +static TBMModuleVersionInfo SprdVersRec = { + "sprd", + "Samsung", + TBM_ABI_VERSION, }; TBMModuleData tbmModuleData = { &SprdVersRec, init_tbm_bufmgr_priv}; @@ -1761,27 +1753,26 @@ TBMModuleData tbmModuleData = { &SprdVersRec, init_tbm_bufmgr_priv}; int init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) { - tbm_bufmgr_sprd bufmgr_sprd; - tbm_bufmgr_backend bufmgr_backend; + tbm_bufmgr_sprd bufmgr_sprd; + tbm_bufmgr_backend bufmgr_backend; - if (!bufmgr) - return 0; + if (!bufmgr) + return 0; - bufmgr_sprd = calloc (1, sizeof(struct _tbm_bufmgr_sprd)); - if (!bufmgr_sprd) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to alloc bufmgr_sprd!\n", getpid()); - return 0; - } + bufmgr_sprd = calloc (1, sizeof(struct _tbm_bufmgr_sprd)); + if (!bufmgr_sprd) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to alloc bufmgr_sprd!\n", getpid()); + return 0; + } if (tbm_backend_is_display_server()) { bufmgr_sprd->fd = -1; bufmgr_sprd->fd = tbm_drm_helper_get_master_fd(); - if (bufmgr_sprd->fd <0) { + if (bufmgr_sprd->fd < 0) { bufmgr_sprd->fd = _tbm_sprd_open_drm(); tbm_drm_helper_set_master_fd(bufmgr_sprd->fd); } - if (bufmgr_sprd->fd <0) { + if (bufmgr_sprd->fd < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); free (bufmgr_sprd); return 0; @@ -1795,110 +1786,104 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } /* open tgl fd for saving cache flush data */ - bufmgr_sprd->tgl_fd = open(tgl_devfile, O_RDWR); - - if (bufmgr_sprd->tgl_fd < 0) { - bufmgr_sprd->tgl_fd = open(tgl_devfile1, O_RDWR); - if (bufmgr_sprd->tgl_fd < 0) { - TBM_SPRD_LOG("[libtbm:%d] " - "error: Fail to open global_lock:%s\n", - getpid(), tgl_devfile); - - free (bufmgr_sprd); - return 0; - } - } - - if (!_tgl_init(bufmgr_sprd->tgl_fd, GLOBAL_KEY)) { - TBM_SPRD_LOG("[libtbm:%d] " - "error: Fail to initialize the tgl\n", - getpid()); - - free (bufmgr_sprd); - return 0; - } - - //Create Hash Table - bufmgr_sprd->hashBos = drmHashCreate (); - - //Check if the tbm manager supports dma fence or not. - int fp = open("/sys/module/dmabuf_sync/parameters/enabled", O_RDONLY); - int length; - char buf[1]; - if (fp != -1) - { - length = read(fp, buf, 1); - - if (length == 1 && buf[0] == '1') - bufmgr_sprd->use_dma_fence = 1; - - close(fp); - } - - bufmgr_backend = tbm_backend_alloc(); - if (!bufmgr_backend) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); - - free (bufmgr_sprd); - return 0; - } - - bufmgr_backend->priv = (void *)bufmgr_sprd; - bufmgr_backend->bufmgr_deinit = tbm_sprd_bufmgr_deinit, - bufmgr_backend->bo_size = tbm_sprd_bo_size, - bufmgr_backend->bo_alloc = tbm_sprd_bo_alloc, - bufmgr_backend->bo_free = tbm_sprd_bo_free, - bufmgr_backend->bo_import = tbm_sprd_bo_import, - bufmgr_backend->bo_import_fd = tbm_sprd_bo_import_fd, - bufmgr_backend->bo_export = tbm_sprd_bo_export, - bufmgr_backend->bo_export_fd = tbm_sprd_bo_export_fd, - bufmgr_backend->bo_get_handle = tbm_sprd_bo_get_handle, - bufmgr_backend->bo_map = tbm_sprd_bo_map, - bufmgr_backend->bo_unmap = tbm_sprd_bo_unmap, - bufmgr_backend->surface_get_plane_data = tbm_sprd_surface_get_plane_data; - bufmgr_backend->surface_supported_format = tbm_sprd_surface_supported_format; - bufmgr_backend->bo_get_flags = tbm_sprd_bo_get_flags; - bufmgr_backend->bo_lock = NULL; - bufmgr_backend->bo_lock2 = tbm_sprd_bo_lock; - bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; - bufmgr_backend->bufmgr_bind_native_display = tbm_sprd_bufmgr_bind_native_display; - - bufmgr_backend->flags |= TBM_LOCK_CTRL_BACKEND; - bufmgr_backend->flags |= TBM_USE_2_0_BACKEND; - - if (!tbm_backend_init (bufmgr, bufmgr_backend)) - { - TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to init backend!\n", getpid()); - tbm_backend_free (bufmgr_backend); - - free (bufmgr_sprd); - return 0; - } + bufmgr_sprd->tgl_fd = open(tgl_devfile, O_RDWR); + + if (bufmgr_sprd->tgl_fd < 0) { + bufmgr_sprd->tgl_fd = open(tgl_devfile1, O_RDWR); + if (bufmgr_sprd->tgl_fd < 0) { + TBM_SPRD_LOG("[libtbm:%d] " + "error: Fail to open global_lock:%s\n", + getpid(), tgl_devfile); + + free (bufmgr_sprd); + return 0; + } + } + + if (!_tgl_init(bufmgr_sprd->tgl_fd, GLOBAL_KEY)) { + TBM_SPRD_LOG("[libtbm:%d] " + "error: Fail to initialize the tgl\n", + getpid()); + + free (bufmgr_sprd); + return 0; + } + + //Create Hash Table + bufmgr_sprd->hashBos = drmHashCreate (); + + //Check if the tbm manager supports dma fence or not. + int fp = open("/sys/module/dmabuf_sync/parameters/enabled", O_RDONLY); + int length; + char buf[1]; + if (fp != -1) { + length = read(fp, buf, 1); + + if (length == 1 && buf[0] == '1') + bufmgr_sprd->use_dma_fence = 1; + + close(fp); + } + + bufmgr_backend = tbm_backend_alloc(); + if (!bufmgr_backend) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); + + free (bufmgr_sprd); + return 0; + } + + bufmgr_backend->priv = (void *)bufmgr_sprd; + bufmgr_backend->bufmgr_deinit = tbm_sprd_bufmgr_deinit; + bufmgr_backend->bo_size = tbm_sprd_bo_size; + bufmgr_backend->bo_alloc = tbm_sprd_bo_alloc; + bufmgr_backend->bo_free = tbm_sprd_bo_free; + bufmgr_backend->bo_import = tbm_sprd_bo_import; + bufmgr_backend->bo_import_fd = tbm_sprd_bo_import_fd; + bufmgr_backend->bo_export = tbm_sprd_bo_export; + bufmgr_backend->bo_export_fd = tbm_sprd_bo_export_fd; + bufmgr_backend->bo_get_handle = tbm_sprd_bo_get_handle; + bufmgr_backend->bo_map = tbm_sprd_bo_map; + bufmgr_backend->bo_unmap = tbm_sprd_bo_unmap; + bufmgr_backend->surface_get_plane_data = tbm_sprd_surface_get_plane_data; + bufmgr_backend->surface_supported_format = tbm_sprd_surface_supported_format; + bufmgr_backend->bo_get_flags = tbm_sprd_bo_get_flags; + bufmgr_backend->bo_lock = NULL; + bufmgr_backend->bo_lock2 = tbm_sprd_bo_lock; + bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; + bufmgr_backend->bufmgr_bind_native_display = tbm_sprd_bufmgr_bind_native_display; + + bufmgr_backend->flags |= TBM_LOCK_CTRL_BACKEND; + bufmgr_backend->flags |= TBM_USE_2_0_BACKEND; + + if (!tbm_backend_init (bufmgr, bufmgr_backend)) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to init backend!\n", getpid()); + tbm_backend_free (bufmgr_backend); + + free (bufmgr_sprd); + return 0; + } #ifdef DEBUG - { - char* env; - env = getenv ("TBM_SPRD_DEBUG"); - if (env) - { - bDebug = atoi (env); - TBM_SPRD_LOG ("TBM_SPRD_DEBUG=%s\n", env); - } - else - { - bDebug = 0; - } - } + { + char *env; + env = getenv ("TBM_SPRD_DEBUG"); + if (env) { + bDebug = atoi (env); + TBM_SPRD_LOG ("TBM_SPRD_DEBUG=%s\n", env); + } else { + bDebug = 0; + } + } #endif - DBG ("[libtbm-sprd:%d] %s DMABUF FENCE is %s\n", getpid(), - __FUNCTION__, bufmgr_sprd->use_dma_fence ? "supported!" : "NOT supported!"); + DBG ("[libtbm-sprd:%d] %s DMABUF FENCE is %s\n", getpid(), + __FUNCTION__, bufmgr_sprd->use_dma_fence ? "supported!" : "NOT supported!"); - DBG ("[libtbm-sprd:%d] %s fd:%d\n", getpid(), - __FUNCTION__, bufmgr_sprd->fd); + DBG ("[libtbm-sprd:%d] %s fd:%d\n", getpid(), + __FUNCTION__, bufmgr_sprd->fd); - return 1; + return 1; } -- 2.7.4 From 6f031bda0debc4d81b3e156f5668ef023454973a Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Wed, 2 Mar 2016 15:07:50 +0900 Subject: [PATCH 05/16] Use device name by drmGetDeviceNameFromFd and search drm device by udev if drmopen is failed Change-Id: Ib96929a7aa01fcd6f7e82b62ff8e85cd24507d1d --- configure.ac | 13 +++-- packaging/libtbm-sprd.spec | 2 +- src/tbm_bufmgr_sprd.c | 142 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 135 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 922d3e3..1a01f3f 100755 --- a/configure.ac +++ b/configure.ac @@ -39,13 +39,16 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) PKG_CHECK_MODULES(LIBDRM, libdrm) PKG_CHECK_MODULES(LIBTBM, libtbm) PKG_CHECK_MODULES(LIBDLOG, dlog) -PKG_CHECK_MODULES(WAYLAND_CLIENT, wayland-client wayland-server) +LIBTBM_SPRD_CFLAGS="$LIBDRM_CFLAGS $LIBTBM_CFLAGS $LIBDLOG_CFLAGS $LIBUDEV_CLFAGS " +LIBTBM_SPRD_LIBS="$LIBDRM_LIBS $LIBTBM_LIBS $LIBDLOG_LIBS $LIBUDEV_LIBS " -WYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client wayland-server` -AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) +PKG_CHECK_MODULES(LIBUDEV, libudev, [udev=yes], [udev=no]) +if test x"$udev" = xyes; then + AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) + LIBTBM_SPRD_CFLAGS="$LIBTBM_SPRD_CFLAGS $LIBUDEV_CFLAGS" + LIBTBM_SPRD_LIBS="$LIBTBM_SPRD_LIBS $LIBUDEV_LIBS" +fi -LIBTBM_SPRD_CFLAGS="$LIBDRM_CFLAGS $LIBTBM_CFLAGS $LIBDLOG_CFLAGS $WAYLAND_CLIENT_CLFAGS " -LIBTBM_SPRD_LIBS="$LIBDRM_LIBS $LIBTBM_LIBS $LIBDLOG_LIBS $WAYLAND_CLIENT_LIBS " AC_SUBST(LIBTBM_SPRD_CFLAGS) AC_SUBST(LIBTBM_SPRD_LIBS) diff --git a/packaging/libtbm-sprd.spec b/packaging/libtbm-sprd.spec index 1a1b0a2..15d3e45 100644 --- a/packaging/libtbm-sprd.spec +++ b/packaging/libtbm-sprd.spec @@ -14,7 +14,7 @@ BuildRequires: pkgconfig(pthread-stubs) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(libudev) BuildRequires: kernel-headers-tizen-dev BuildConflicts: linux-glibc-devel diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 9a5c482..b8e8eef 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "config.h" #endif +#if HAVE_UDEV +#include +#endif + #include #include #include @@ -64,6 +68,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include static int bDebug = 0; +#define SPRD_DRM_NAME "sprd" + char * target_name() { @@ -224,6 +230,8 @@ struct _tbm_bufmgr_sprd { int tgl_fd; void *bind_display; + + char *device_name; }; char *STR_DEVICE[] = { @@ -360,6 +368,98 @@ _tgl_get_data(int fd, unsigned int key, unsigned int *locked) } static int +_tbm_sprd_open_drm() +{ + int fd = -1; + + fd = drmOpen(SPRD_DRM_NAME, NULL); + if (fd < 0) { + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "warning %s:%d fail to open drm\n", + getpid(), __FUNCTION__, __LINE__); + } + +#ifdef HAVE_UDEV + if (fd < 0) { + struct udev *udev = NULL; + struct udev_enumerate *e = NULL; + struct udev_list_entry *entry = NULL; + struct udev_device *device = NULL, *drm_device = NULL, *device_parent = NULL; + const char *filepath; + struct stat s; + int fd = -1; + int ret; + + TBM_SPRD_LOG ("[libtbm-sprd:%d] " + "%s:%d search drm-device by udev\n", + getpid(), __FUNCTION__, __LINE__); + + udev = udev_new(); + if (!udev) { + TBM_SPRD_LOG("udev_new() failed.\n"); + return -1; + } + + e = udev_enumerate_new(udev); + udev_enumerate_add_match_subsystem(e, "drm"); + udev_enumerate_add_match_sysname(e, "card[0-9]*"); + udev_enumerate_scan_devices(e); + + udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) { + device = udev_device_new_from_syspath(udev_enumerate_get_udev(e), + udev_list_entry_get_name(entry)); + device_parent = udev_device_get_parent(device); + /* Not need unref device_parent. device_parent and device have same refcnt */ + if (device_parent) { + if (strcmp(udev_device_get_sysname(device_parent), "sprd-drm") == 0) { + drm_device = device; + DBG("[%s] Found render device: '%s' (%s)\n", + target_name(), + udev_device_get_syspath(drm_device), + udev_device_get_sysname(device_parent)); + break; + } + } + udev_device_unref(device); + } + + udev_enumerate_unref(e); + + /* Get device file path. */ + filepath = udev_device_get_devnode(drm_device); + if (!filepath) { + TBM_SPRD_LOG("udev_device_get_devnode() failed.\n"); + udev_device_unref(drm_device); + udev_unref(udev); + return -1; + } + + /* Open DRM device file and check validity. */ + fd = open(filepath, O_RDWR | O_CLOEXEC); + if (fd < 0) { + TBM_SPRD_LOG("open(%s, O_RDWR | O_CLOEXEC) failed.\n"); + udev_device_unref(drm_device); + udev_unref(udev); + return -1; + } + + ret = fstat(fd, &s); + if (ret) { + TBM_SPRD_LOG("fstat() failed %s.\n"); + udev_device_unref(drm_device); + udev_unref(udev); + return -1; + } + + udev_device_unref(drm_device); + udev_unref(udev); + } +#endif + + return fd; +} + +static int _sprd_bo_cache_flush (tbm_bo bo, int flags) { tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); @@ -546,16 +646,6 @@ _bo_destroy_cache_state(tbm_bo bo) _tgl_destroy(bufmgr_sprd->tgl_fd, bo_sprd->name); } -static inline int -_is_drm_master(int drm_fd) -{ - drm_magic_t magic; - - return drmGetMagic(drm_fd, &magic) == 0 && - drmAuthMagic(drm_fd, magic) == 0; -} - - #ifndef USE_CONTIG_ONLY static unsigned int _get_sprd_flag_from_tbm (unsigned int ftbm) @@ -1429,7 +1519,12 @@ tbm_sprd_bufmgr_deinit (void *priv) close (bufmgr_sprd->tgl_fd); if (bufmgr_sprd->bind_display) - tbm_drm_helper_wl_server_deinit(); + tbm_drm_helper_wl_auth_server_deinit(); + + if (bufmgr_sprd->device_name) + free(bufmgr_sprd->device_name); + + close (bufmgr_sprd->fd); free (bufmgr_sprd); } @@ -1729,8 +1824,8 @@ tbm_sprd_bufmgr_bind_native_display (tbm_bufmgr bufmgr, void *NativeDisplay) bufmgr_sprd = tbm_backend_get_priv_from_bufmgr(bufmgr); SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0); - if (!tbm_drm_helper_wl_server_init(NativeDisplay, bufmgr_sprd->fd, - "/dev/dri/card0", 0)) { + if (!tbm_drm_helper_wl_auth_server_init(NativeDisplay, bufmgr_sprd->fd, + bufmgr_sprd->device_name, 0)) { TBM_SPRD_LOG("[libtbm-sprd:%d] error:Fail to tbm_drm_helper_wl_server_init\n"); return 0; } @@ -1766,19 +1861,34 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } if (tbm_backend_is_display_server()) { + int master_fd = -1; + bufmgr_sprd->fd = -1; - bufmgr_sprd->fd = tbm_drm_helper_get_master_fd(); - if (bufmgr_sprd->fd < 0) { + master_fd = tbm_drm_helper_get_master_fd(); + if (master_fd < 0) { bufmgr_sprd->fd = _tbm_sprd_open_drm(); tbm_drm_helper_set_master_fd(bufmgr_sprd->fd); + } else { + bufmgr_sprd->fd = dup(master_fd); } + if (bufmgr_sprd->fd < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); free (bufmgr_sprd); return 0; } + + bufmgr_sprd->device_name = drmGetDeviceNameFromFd(bufmgr_sprd->fd); + + if (!bufmgr_sprd->device_name) + { + TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to get device name!\n", getpid()); + free (bufmgr_sprd); + return 0; + } + } else { - if (!tbm_drm_helper_get_auth_info(&(bufmgr_sprd->fd), NULL, NULL)) { + if (!tbm_drm_helper_get_auth_info(&(bufmgr_sprd->fd), &(bufmgr_sprd->device_name), NULL)) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to get auth drm info!\n", getpid()); free (bufmgr_sprd); return 0; -- 2.7.4 From ff48e98525b0684d281efc6640a93b75e6b2718a Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 3 Mar 2016 15:36:30 +0900 Subject: [PATCH 06/16] Fix fd leak Change-Id: Ia8d6a821b58bf2532dda86a0e9ac7d1f27299f9c --- src/tbm_bufmgr_sprd.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index b8e8eef..63b0eb6 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -1516,14 +1516,13 @@ tbm_sprd_bufmgr_deinit (void *priv) bufmgr_sprd->hashBos = NULL; } - close (bufmgr_sprd->tgl_fd); - if (bufmgr_sprd->bind_display) tbm_drm_helper_wl_auth_server_deinit(); if (bufmgr_sprd->device_name) free(bufmgr_sprd->device_name); + close (bufmgr_sprd->tgl_fd); close (bufmgr_sprd->fd); free (bufmgr_sprd); @@ -1905,6 +1904,7 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) "error: Fail to open global_lock:%s\n", getpid(), tgl_devfile); + close(bufmgr_sprd->fd); free (bufmgr_sprd); return 0; } @@ -1915,6 +1915,9 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) "error: Fail to initialize the tgl\n", getpid()); + close(bufmgr_sprd->fd); + close(bufmgr_sprd->tgl_fd); + free (bufmgr_sprd); return 0; } @@ -1939,6 +1942,9 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) if (!bufmgr_backend) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); + close(bufmgr_sprd->fd); + close(bufmgr_sprd->tgl_fd); + free (bufmgr_sprd); return 0; } @@ -1970,6 +1976,9 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to init backend!\n", getpid()); tbm_backend_free (bufmgr_backend); + close(bufmgr_sprd->tgl_fd); + close(bufmgr_sprd->fd); + free (bufmgr_sprd); return 0; } -- 2.7.4 From 8a291a5761a4416adc82d0db79012fa59e050947 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 3 Mar 2016 15:48:52 +0900 Subject: [PATCH 07/16] Don't use sharing master fd code with libtdm-sprd backend Change-Id: I850fc4d50bb0e3a16a72fe0ce2a1ed602585f2fa --- src/tbm_bufmgr_sprd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 63b0eb6..e8874fa 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -367,6 +367,7 @@ _tgl_get_data(int fd, unsigned int key, unsigned int *locked) return arg.data1; } +#if 0 static int _tbm_sprd_open_drm() { @@ -458,6 +459,7 @@ _tbm_sprd_open_drm() return fd; } +#endif static int _sprd_bo_cache_flush (tbm_bo bo, int flags) @@ -1860,6 +1862,8 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } if (tbm_backend_is_display_server()) { +#if 0 + /* this code is applied with libtdm-sprd */ int master_fd = -1; bufmgr_sprd->fd = -1; @@ -1870,6 +1874,9 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } else { bufmgr_sprd->fd = dup(master_fd); } +#else + bufmgr_sprd->fd = dup(fd); +#endif if (bufmgr_sprd->fd < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); -- 2.7.4 From f0a651bdfe61dc8d7a4b2d008f9b6d57a45af18d Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 3 Mar 2016 16:35:49 +0900 Subject: [PATCH 08/16] Package version up Change-Id: Iec9968da483ea3818343b87b77cea73f0f53dce6 --- packaging/libtbm-sprd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtbm-sprd.spec b/packaging/libtbm-sprd.spec index 15d3e45..ea78e30 100644 --- a/packaging/libtbm-sprd.spec +++ b/packaging/libtbm-sprd.spec @@ -1,5 +1,5 @@ Name: libtbm-sprd -Version: 1.0.0 +Version: 1.0.1 Release: 0 License: MIT Summary: Tizen Buffer Manager - sprd backend -- 2.7.4 From bde2517dfd5e2b3142cd835545728679e3c3fef7 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 11 Mar 2016 14:03:35 +0900 Subject: [PATCH 09/16] use the tizen directory macros at spec file Change-Id: I5f92b0ab642bea8fe6a86b47eb46a21b6b24858a --- packaging/libtbm-sprd.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packaging/libtbm-sprd.spec b/packaging/libtbm-sprd.spec index ea78e30..9bcb46a 100644 --- a/packaging/libtbm-sprd.spec +++ b/packaging/libtbm-sprd.spec @@ -21,6 +21,8 @@ BuildConflicts: linux-glibc-devel %description descriptionion:Tizen Buffer manager backend module for spreadtrum +%global TZ_SYS_RO_SHARE %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} + %prep %setup -q @@ -33,8 +35,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -mkdir -p %{buildroot}/usr/share/license -cp -af COPYING %{buildroot}/usr/share/license/%{name} +mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license +cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name} %make_install @@ -47,6 +49,7 @@ ln -s libtbm_sprd.so %{_libdir}/bufmgr/libtbm_default.so %postun -p /sbin/ldconfig %files +%defattr(-,root,root,-) +%{TZ_SYS_RO_SHARE}/license/%{name} %{_libdir}/bufmgr/libtbm_*.so* -/usr/share/license/%{name} -- 2.7.4 From 6027ad3d71bc8763ec16515d960db52407914675 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 22 Mar 2016 14:00:04 +0900 Subject: [PATCH 10/16] chanage the COPYING file Change-Id: I8eac8a76d8959929bbd47741a7b72d6cff5120fe --- COPYING | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/COPYING b/COPYING index be13227..487fd3e 100644 --- a/COPYING +++ b/COPYING @@ -1,18 +1,21 @@ Copyright (C) 2000 - 2015 Samsung Electronics co., Ltd. All Rights Reserved. -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 fur- -nished to do so, subject to the following conditions: +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, sub license, 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 shall be included in -all copies or substantial portions of the Software. +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, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. -- 2.7.4 From a5a43bbc884c08b37573b0df8b8848a8f98cc296 Mon Sep 17 00:00:00 2001 From: Junkyeong Kim Date: Thu, 31 Mar 2016 19:45:19 +0900 Subject: [PATCH 11/16] add type casting for size vaule and fix handle leak Change-Id: I69de677bf924cee119d97bcd2946a7f5606bae77 Signed-off-by: Junkyeong Kim --- src/tbm_bufmgr_sprd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index e8874fa..f14aab2 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -834,7 +834,7 @@ tbm_sprd_bo_alloc (tbm_bo bo, int size, int flags) } #endif // USE_CONTIG_ONLY struct drm_sprd_gem_create arg = {0, }; - arg.size = size; + arg.size = (uint64_t)size; arg.flags = sprd_flags; if (drmCommandWriteRead(bufmgr_sprd->fd, DRM_SPRD_GEM_CREATE, &arg, sizeof(arg))) { @@ -1889,6 +1889,7 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) if (!bufmgr_sprd->device_name) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to get device name!\n", getpid()); + close(bufmgr_sprd->fd); free (bufmgr_sprd); return 0; } -- 2.7.4 From 5b5a85fd2db832693afe654cede88f03ea3efc05 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Mon, 7 Mar 2016 21:13:12 +0900 Subject: [PATCH 12/16] Remove backend flag LOCK CTRL Change-Id: Ia8bb8743d6e49119e506c19962f4bf5a08532d12 --- src/tbm_bufmgr_sprd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index f14aab2..36eabbf 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -1977,7 +1977,6 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; bufmgr_backend->bufmgr_bind_native_display = tbm_sprd_bufmgr_bind_native_display; - bufmgr_backend->flags |= TBM_LOCK_CTRL_BACKEND; bufmgr_backend->flags |= TBM_USE_2_0_BACKEND; if (!tbm_backend_init (bufmgr, bufmgr_backend)) { -- 2.7.4 From fa552c634424ec4508da0a9634806ccfdbc11637 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Mon, 7 Mar 2016 21:14:05 +0900 Subject: [PATCH 13/16] Share master fd widh tdm backend Change-Id: Iecb82426fd0beeb9f7cda78035293ed1c9cc68c4 --- src/tbm_bufmgr_sprd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 36eabbf..7ce1b42 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -367,7 +367,6 @@ _tgl_get_data(int fd, unsigned int key, unsigned int *locked) return arg.data1; } -#if 0 static int _tbm_sprd_open_drm() { @@ -459,7 +458,6 @@ _tbm_sprd_open_drm() return fd; } -#endif static int _sprd_bo_cache_flush (tbm_bo bo, int flags) @@ -1862,8 +1860,6 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } if (tbm_backend_is_display_server()) { -#if 0 - /* this code is applied with libtdm-sprd */ int master_fd = -1; bufmgr_sprd->fd = -1; @@ -1874,9 +1870,6 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) } else { bufmgr_sprd->fd = dup(master_fd); } -#else - bufmgr_sprd->fd = dup(fd); -#endif if (bufmgr_sprd->fd < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); -- 2.7.4 From a57bab2039264c914b68e4a3b507eb56142590a0 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 24 Mar 2016 21:00:36 +0900 Subject: [PATCH 14/16] Fix flink name type Change-Id: I2a2b627d27263c57714b09f9a8f2a558e224369e --- src/tbm_bufmgr_sprd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 7ce1b42..846f74d 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -1065,7 +1065,7 @@ tbm_sprd_bo_import_fd (tbm_bo bo, tbm_fd key) tbm_bo_sprd bo_sprd; PrivGem *privGem = NULL; int ret; - int name; + unsigned int name; bufmgr_sprd = (tbm_bufmgr_sprd)tbm_backend_get_bufmgr_priv(bo); SPRD_RETURN_VAL_IF_FAIL (bufmgr_sprd != NULL, 0); -- 2.7.4 From 885fa5c8b4d6a545af1d6ed48e19b0d5d2ca2e72 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 24 Mar 2016 21:02:12 +0900 Subject: [PATCH 15/16] Change parameter of backend fuction Change-Id: Ie32b515a0313e9005a8e100f4d72210cc05dd03e --- src/tbm_bufmgr_sprd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 846f74d..064fafc 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -1553,7 +1553,6 @@ tbm_sprd_surface_supported_format(uint32_t **formats, uint32_t *num) /** * @brief get the plane data of the surface. - * @param[in] surface : the surface * @param[in] width : the width of the surface * @param[in] height : the height of the surface * @param[in] format : the format of the surface @@ -1565,7 +1564,7 @@ tbm_sprd_surface_supported_format(uint32_t **formats, uint32_t *num) * @return 1 if this function succeeds, otherwise 0. */ int -tbm_sprd_surface_get_plane_data(tbm_surface_h surface, int width, int height, +tbm_sprd_surface_get_plane_data(int width, int height, tbm_format format, int plane_idx, uint32_t *size, uint32_t *offset, uint32_t *pitch, int *bo_idx) { @@ -1965,13 +1964,10 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) bufmgr_backend->surface_get_plane_data = tbm_sprd_surface_get_plane_data; bufmgr_backend->surface_supported_format = tbm_sprd_surface_supported_format; bufmgr_backend->bo_get_flags = tbm_sprd_bo_get_flags; - bufmgr_backend->bo_lock = NULL; - bufmgr_backend->bo_lock2 = tbm_sprd_bo_lock; + bufmgr_backend->bo_lock = tbm_sprd_bo_lock; bufmgr_backend->bo_unlock = tbm_sprd_bo_unlock; bufmgr_backend->bufmgr_bind_native_display = tbm_sprd_bufmgr_bind_native_display; - bufmgr_backend->flags |= TBM_USE_2_0_BACKEND; - if (!tbm_backend_init (bufmgr, bufmgr_backend)) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to init backend!\n", getpid()); tbm_backend_free (bufmgr_backend); -- 2.7.4 From 5642912318e722860e426355b233c6802ac9be70 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Fri, 25 Mar 2016 14:24:30 +0900 Subject: [PATCH 16/16] Set and unset tbm master fd Change-Id: I5f0eb70d6dcef075ea4fec644fee9b0c3405b9cd --- src/tbm_bufmgr_sprd.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c index 064fafc..16ada73 100755 --- a/src/tbm_bufmgr_sprd.c +++ b/src/tbm_bufmgr_sprd.c @@ -1519,6 +1519,9 @@ tbm_sprd_bufmgr_deinit (void *priv) if (bufmgr_sprd->bind_display) tbm_drm_helper_wl_auth_server_deinit(); + if (tbm_backend_is_display_server()) + tbm_drm_helper_unset_tbm_master_fd(); + if (bufmgr_sprd->device_name) free(bufmgr_sprd->device_name); @@ -1863,19 +1866,19 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd) bufmgr_sprd->fd = -1; master_fd = tbm_drm_helper_get_master_fd(); - if (master_fd < 0) { + if (master_fd < 0) bufmgr_sprd->fd = _tbm_sprd_open_drm(); - tbm_drm_helper_set_master_fd(bufmgr_sprd->fd); - } else { - bufmgr_sprd->fd = dup(master_fd); - } - + else + bufmgr_sprd->fd = master_fd; + if (bufmgr_sprd->fd < 0) { TBM_SPRD_LOG ("[libtbm-sprd:%d] error: Fail to create drm!\n", getpid()); free (bufmgr_sprd); return 0; } + tbm_drm_helper_set_tbm_master_fd(bufmgr_sprd->fd); + bufmgr_sprd->device_name = drmGetDeviceNameFromFd(bufmgr_sprd->fd); if (!bufmgr_sprd->device_name) -- 2.7.4