From: SooChan Lim Date: Tue, 20 Mar 2018 02:35:36 +0000 (+0900) Subject: use the tbm_log.h for logging. X-Git-Tag: submit/tizen/20180320.042059~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c794acf41b5da79054854f36ca34228ab377c1f;p=platform%2Fadaptation%2Flibtbm-dumb.git use the tbm_log.h for logging. Change-Id: I28b75cbc5f90d286e6e7713acdc0621c918bb632 --- diff --git a/src/tbm_bufmgr_dumb.c b/src/tbm_bufmgr_dumb.c index 16ebf09..872fe67 100644 --- a/src/tbm_bufmgr_dumb.c +++ b/src/tbm_bufmgr_dumb.c @@ -49,55 +49,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include -#define DEBUG #define USE_DMAIMPORT #define TBM_COLOR_FORMAT_COUNT 4 -#ifdef DEBUG -#define LOG_TAG "TBM_BACKEND" -#include -static int bDebug = 0; - -static char * -target_name() -{ - static char app_name[128] = {0, }; - static int initialized = 0; - char *slash; - FILE *f; - if (initialized) - return app_name; - - /* get the application name */ - f = fopen("/proc/self/cmdline", "r"); - if (!f) - return NULL; - - memset(app_name, 0x00, sizeof(app_name)); - - if (fgets(app_name, 100, f) == NULL) { - fclose(f); - return NULL; - } - - fclose(f); - - if ((slash = strrchr(app_name, '/')) != NULL) - memmove(app_name, slash+1, strlen(slash)); - - initialized = 1; - - return app_name; -} - -#define TBM_DUMB_ERROR(fmt, args...) LOGE("\033[31m" "[%s] " fmt "\033[0m", target_name(), ##args) -#define TBM_DUMB_DEBUG(fmt, args...) {if (bDebug&01) LOGD("[%s] " fmt, target_name(), ##args); } -#else -#define TBM_DUMB_ERROR(...) -#define TBM_DUMB_DEBUG(...) -#endif - #define STRERR_BUFSIZE 128 #define SIZE_ALIGN(value, base) (((value) + ((base) - 1)) & ~((base) - 1)) @@ -109,13 +65,13 @@ target_name() /* check condition */ #define DUMB_RETURN_IF_FAIL(cond) {\ if (!(cond)) {\ - TBM_DUMB_ERROR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ + TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ return;\ } \ } #define DUMB_RETURN_VAL_IF_FAIL(cond, val) {\ if (!(cond)) {\ - TBM_DUMB_ERROR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ + TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ return val;\ } \ } @@ -227,7 +183,7 @@ _tbm_dumb_open_drm() udev = udev_new(); if (!udev) { - TBM_DUMB_ERROR("udev_new() failed.\n"); + TBM_ERR("udev_new() failed.\n"); return -1; } @@ -265,7 +221,7 @@ _tbm_dumb_open_drm() /* Get device file path. */ filepath = udev_device_get_devnode(drm_device); if (!filepath) { - TBM_DUMB_ERROR("udev_device_get_devnode() failed.\n"); + TBM_ERR("udev_device_get_devnode() failed.\n"); udev_device_unref(drm_device); udev_unref(udev); return -1; @@ -274,7 +230,7 @@ _tbm_dumb_open_drm() /* Open DRM device file and check validity. */ fd = open(filepath, O_RDWR | O_CLOEXEC); if (fd < 0) { - TBM_DUMB_ERROR("open(%s, O_RDWR | O_CLOEXEC) failed.\n"); + TBM_ERR("open(%s, O_RDWR | O_CLOEXEC) failed.\n"); udev_device_unref(drm_device); udev_unref(udev); return -1; @@ -282,7 +238,7 @@ _tbm_dumb_open_drm() ret = fstat(fd, &s); if (ret) { - TBM_DUMB_ERROR("fstat() failed %s.\n"); + TBM_ERR("fstat() failed %s.\n"); close(fd); udev_device_unref(drm_device); udev_unref(udev); @@ -320,7 +276,7 @@ _get_name(int fd, unsigned int gem) arg.handle = gem; if (drmIoctl(fd, DRM_IOCTL_GEM_FLINK, &arg)) { - TBM_DUMB_ERROR("fail to DRM_IOCTL_GEM_FLINK gem:%d", gem); + TBM_ERR("fail to DRM_IOCTL_GEM_FLINK gem:%d", gem); return 0; } @@ -346,14 +302,14 @@ _dumb_bo_handle(tbm_bo_dumb bo_dumb, int device) arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg)) { - TBM_DUMB_ERROR("Cannot map_ gem=%d\n", bo_dumb->gem); + TBM_ERR("Cannot map_ gem=%d\n", bo_dumb->gem); return (tbm_bo_handle) NULL; } map = mmap(NULL, bo_dumb->size, PROT_READ|PROT_WRITE, MAP_SHARED, bo_dumb->fd, arg.offset); if (map == MAP_FAILED) { - TBM_DUMB_ERROR("Cannot usrptr gem=%d\n", bo_dumb->gem); + TBM_ERR("Cannot usrptr gem=%d\n", bo_dumb->gem); return (tbm_bo_handle) NULL; } bo_dumb->pBase = map; @@ -367,7 +323,7 @@ _dumb_bo_handle(tbm_bo_dumb bo_dumb, int device) arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { - TBM_DUMB_ERROR("Cannot dmabuf=%d\n", bo_dumb->gem); + TBM_ERR("Cannot dmabuf=%d\n", bo_dumb->gem); return (tbm_bo_handle) NULL; } bo_dumb->dmabuf = arg.fd; @@ -382,7 +338,7 @@ _dumb_bo_handle(tbm_bo_dumb bo_dumb, int device) arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { - TBM_DUMB_ERROR("Cannot dmabuf=%d\n", bo_dumb->gem); + TBM_ERR("Cannot dmabuf=%d\n", bo_dumb->gem); return (tbm_bo_handle) NULL; } bo_dumb->dmabuf = arg.fd; @@ -391,7 +347,7 @@ _dumb_bo_handle(tbm_bo_dumb bo_dumb, int device) bo_handle.u32 = (uint32_t)bo_dumb->dmabuf; break; default: - TBM_DUMB_ERROR("Not supported device:%d\n", device); + TBM_ERR("Not supported device:%d\n", device); bo_handle.ptr = (void *) NULL; break; } @@ -403,7 +359,7 @@ _dumb_bo_handle(tbm_bo_dumb bo_dumb, int device) static int _dumb_cache_flush(int fd, tbm_bo_dumb bo_dumb, int flags) { - TBM_DUMB_ERROR("warning fail to flush the cache.\n"); + TBM_ERR("warning fail to flush the cache.\n"); return 1; } #endif @@ -429,7 +385,7 @@ tbm_dumb_bufmgr_bind_native_display(tbm_backend_bufmgr_data *bufmgr_data, tbm_na if (!tbm_drm_helper_wl_auth_server_init(native_display, bufmgr_dumb->fd, bufmgr_dumb->device_name, 0)) { - TBM_DUMB_ERROR("fail to tbm_drm_helper_wl_server_init\n"); + TBM_ERR("fail to tbm_drm_helper_wl_server_init\n"); return TBM_ERROR_OPERATION_FAILED; } @@ -456,7 +412,7 @@ tbm_dumb_bufmgr_get_supported_formats(tbm_backend_bufmgr_data *bufmgr_data, *formats = color_formats; *num = TBM_COLOR_FORMAT_COUNT; - TBM_DUMB_DEBUG("supported format count = %d\n", *num); + TBM_DBG("supported format count = %d\n", *num); return TBM_ERROR_NONE; } @@ -710,7 +666,7 @@ tbm_dumb_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, int size, tbm_bo_ unsigned int dumb_flags; if (bufmgr_dumb == NULL) { - TBM_DUMB_ERROR("bufmgr_data is null\n"); + TBM_ERR("bufmgr_data is null\n"); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return NULL; @@ -718,7 +674,7 @@ tbm_dumb_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, int size, tbm_bo_ bo_dumb = calloc(1, sizeof(struct _tbm_bo_dumb)); if (!bo_dumb) { - TBM_DUMB_ERROR("fail to allocate the bo_dumb private\n"); + TBM_ERR("fail to allocate the bo_dumb private\n"); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; return NULL; @@ -735,7 +691,7 @@ tbm_dumb_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, int size, tbm_bo_ arg.width = size; arg.flags = dumb_flags; if (drmIoctl(bufmgr_dumb->fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg)) { - TBM_DUMB_ERROR("Cannot create bo_dumb(flag:%x, size:%d)\n", arg.flags, + TBM_ERR("Cannot create bo_dumb(flag:%x, size:%d)\n", arg.flags, (unsigned int)size); free(bo_dumb); if (error) @@ -757,7 +713,7 @@ tbm_dumb_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, int size, tbm_bo_ arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { - TBM_DUMB_ERROR("Cannot dmabuf=%d\n", bo_dumb->gem); + TBM_ERR("Cannot dmabuf=%d\n", bo_dumb->gem); free(bo_dumb); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -768,9 +724,9 @@ tbm_dumb_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, int size, tbm_bo_ /* add bo to hash */ if (drmHashInsert(bufmgr_dumb->hashBos, bo_dumb->name, (void *)bo_dumb) < 0) - TBM_DUMB_ERROR("error Cannot insert bo to Hash(%d)\n", bo_dumb->name); + TBM_ERR("error Cannot insert bo to Hash(%d)\n", bo_dumb->name); - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), flags:%d(%d), size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), flags:%d(%d), size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->flags_tbm, @@ -793,7 +749,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ char buf[STRERR_BUFSIZE]; if (bufmgr_dumb == NULL) { - TBM_DUMB_ERROR("bufmgr_data is null\n"); + TBM_ERR("bufmgr_data is null\n"); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return NULL; @@ -805,7 +761,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ arg.fd = key; arg.flags = 0; if (drmIoctl(bufmgr_dumb->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &arg)) { - TBM_DUMB_ERROR("Cannot get gem handle from fd:%d (%s)\n", + TBM_ERR("Cannot get gem handle from fd:%d (%s)\n", arg.fd, strerror_r(errno, buf, STRERR_BUFSIZE)); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -815,7 +771,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ name = _get_name(bufmgr_dumb->fd, gem); if (name == 0) { - TBM_DUMB_ERROR("Cannot get name from gem:%d, fd:%d (%s)\n", + TBM_ERR("Cannot get name from gem:%d, fd:%d (%s)\n", gem, key, strerror_r(errno, buf, STRERR_BUFSIZE)); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -844,7 +800,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ /* Open the same GEM object only for finding out its size */ open_arg.name = name; if (drmIoctl(bufmgr_dumb->fd, DRM_IOCTL_GEM_OPEN, &open_arg)) { - TBM_DUMB_ERROR("Cannot get gem info from gem:%d, fd:%d (%s)\n", + TBM_ERR("Cannot get gem info from gem:%d, fd:%d (%s)\n", gem, key, strerror_r(errno, buf, STRERR_BUFSIZE)); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -855,7 +811,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ struct drm_gem_close gem_close; gem_close.handle = open_arg.handle; if (drmIoctl(bufmgr_dumb->fd, DRM_IOCTL_GEM_CLOSE, &gem_close)) { - TBM_DUMB_ERROR("Cannot close gem_handle.\n", + TBM_ERR("Cannot close gem_handle.\n", strerror_r(errno, buf, STRERR_BUFSIZE)); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -867,7 +823,7 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ bo_dumb = calloc(1, sizeof(struct _tbm_bo_dumb)); if (!bo_dumb) { - TBM_DUMB_ERROR("bo_dumb:%p fail to allocate the bo_dumb\n", bo_dumb); + TBM_ERR("bo_dumb:%p fail to allocate the bo_dumb\n", bo_dumb); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; return NULL; @@ -884,10 +840,10 @@ tbm_dumb_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tbm_ /* add bo_dumb to hash */ if (drmHashInsert(bufmgr_dumb->hashBos, bo_dumb->name, (void *)bo_dumb) < 0) - TBM_DUMB_ERROR("bo_dumb:%p Cannot insert bo_dumb to Hash(%d) from gem:%d, fd:%d\n", + TBM_ERR("bo_dumb:%p Cannot insert bo_dumb to Hash(%d) from gem:%d, fd:%d\n", bo_dumb, bo_dumb->name, gem, key); - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d, size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d, size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -909,7 +865,7 @@ tbm_dumb_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key, tb int ret; if (bufmgr_dumb == NULL) { - TBM_DUMB_ERROR("bufmgr_data is null\n"); + TBM_ERR("bufmgr_data is null\n"); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return NULL; @@ -926,7 +882,7 @@ tbm_dumb_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key, tb arg.name = key; if (drmIoctl(bufmgr_dumb->fd, DRM_IOCTL_GEM_OPEN, &arg)) { - TBM_DUMB_ERROR("Cannot open gem name=%d\n", key); + TBM_ERR("Cannot open gem name=%d\n", key); if (error) *error = TBM_ERROR_OPERATION_FAILED; return NULL; @@ -934,7 +890,7 @@ tbm_dumb_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key, tb bo_dumb = calloc(1, sizeof(struct _tbm_bo_dumb)); if (!bo_dumb) { - TBM_DUMB_ERROR("fail to allocate the bo_dumb private\n"); + TBM_ERR("fail to allocate the bo_dumb private\n"); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; return NULL; @@ -952,7 +908,7 @@ tbm_dumb_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key, tb arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) { - TBM_DUMB_ERROR("fail to DRM_IOCTL_PRIME_HANDLE_TO_FD gem=%d\n", bo_dumb->gem); + TBM_ERR("fail to DRM_IOCTL_PRIME_HANDLE_TO_FD gem=%d\n", bo_dumb->gem); if (error) *error = TBM_ERROR_OPERATION_FAILED; free(bo_dumb); @@ -963,9 +919,9 @@ tbm_dumb_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key, tb /* add bo to hash */ if (drmHashInsert(bufmgr_dumb->hashBos, bo_dumb->name, (void *)bo_dumb) < 0) - TBM_DUMB_ERROR("Cannot insert bo_dumb to Hash(%d)\n", bo_dumb->name); + TBM_ERR("Cannot insert bo_dumb to Hash(%d)\n", bo_dumb->name); - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d(%d), size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d(%d), size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -994,7 +950,7 @@ tbm_dumb_bo_free(tbm_backend_bo_data *bo_data) if (!bufmgr_dumb) return; - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -1002,7 +958,7 @@ tbm_dumb_bo_free(tbm_backend_bo_data *bo_data) if (bo_dumb->pBase) { if (munmap(bo_dumb->pBase, bo_dumb->size) == -1) { - TBM_DUMB_ERROR("bo_dumb:%p fail to munmap(%s)\n", + TBM_ERR("bo_dumb:%p fail to munmap(%s)\n", bo_dumb, strerror_r(errno, buf, STRERR_BUFSIZE)); } } @@ -1018,10 +974,10 @@ tbm_dumb_bo_free(tbm_backend_bo_data *bo_data) if (ret == 0) drmHashDelete(bufmgr_dumb->hashBos, bo_dumb->name); else - TBM_DUMB_ERROR("Cannot find bo_dumb to Hash(%d), ret=%d\n", bo_dumb->name, ret); + TBM_ERR("Cannot find bo_dumb to Hash(%d), ret=%d\n", bo_dumb->name, ret); if (temp != bo_dumb) - TBM_DUMB_ERROR("hashBos probably has several BOs with same name!!!\n"); + TBM_ERR("hashBos probably has several BOs with same name!!!\n"); /* Free gem handle */ struct drm_gem_close arg = {0, }; @@ -1029,7 +985,7 @@ tbm_dumb_bo_free(tbm_backend_bo_data *bo_data) memset(&arg, 0, sizeof(arg)); arg.handle = bo_dumb->gem; if (drmIoctl(bo_dumb->fd, DRM_IOCTL_GEM_CLOSE, &arg)) - TBM_DUMB_ERROR("bo_dumb:%p fail to gem close.(%s)\n", + TBM_ERR("bo_dumb:%p fail to gem close.(%s)\n", bo_dumb, strerror_r(errno, buf, STRERR_BUFSIZE)); free(bo_dumb); @@ -1082,13 +1038,13 @@ tbm_dumb_bo_get_handle(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, } if (!bo_dumb->gem) { - TBM_DUMB_ERROR("Cannot map gem=%d\n", bo_dumb->gem); + TBM_ERR("Cannot map gem=%d\n", bo_dumb->gem); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return (tbm_bo_handle) NULL; } - TBM_DUMB_DEBUG("bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d, size:%d, %s\n", + TBM_DBG("bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d, size:%d, %s\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -1099,7 +1055,7 @@ tbm_dumb_bo_get_handle(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, /*Get mapped bo_handle*/ bo_handle = _dumb_bo_handle(bo_dumb, device); if (bo_handle.ptr == NULL) { - TBM_DUMB_ERROR("Cannot get handle: gem:%d, device:%d\n", + TBM_ERR("Cannot get handle: gem:%d, device:%d\n", bo_dumb->gem, device); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -1134,13 +1090,13 @@ tbm_dumb_bo_map(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, } if (!bo_dumb->gem) { - TBM_DUMB_ERROR("Cannot map gem=%d\n", bo_dumb->gem); + TBM_ERR("Cannot map gem=%d\n", bo_dumb->gem); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return (tbm_bo_handle) NULL; } - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, %s, %s\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, %s, %s\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -1150,7 +1106,7 @@ tbm_dumb_bo_map(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, /*Get mapped bo_handle*/ bo_handle = _dumb_bo_handle(bo_dumb, device); if (bo_handle.ptr == NULL) { - TBM_DUMB_ERROR("Cannot get handle: gem:%d, device:%d, opt:%d\n", + TBM_ERR("Cannot get handle: gem:%d, device:%d, opt:%d\n", bo_dumb->gem, device, opt); if (error) *error = TBM_ERROR_INVALID_PARAMETER; @@ -1179,7 +1135,7 @@ tbm_dumb_bo_unmap(tbm_backend_bo_data *bo_data) if (!bo_dumb->gem) return TBM_ERROR_INVALID_PARAMETER; - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf); @@ -1207,7 +1163,7 @@ tbm_dumb_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, return TBM_ERROR_INVALID_PARAMETER; if (device != TBM_DEVICE_3D && device != TBM_DEVICE_CPU) { - TBM_DUMB_DEBUG("Not support device type,\n"); + TBM_DBG("Not support device type,\n"); return TBM_ERROR_OPERATION_FAILED; } @@ -1224,20 +1180,20 @@ tbm_dumb_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, if (device == TBM_DEVICE_3D) fence.type = DMA_BUF_ACCESS_READ | DMA_BUF_ACCESS_DMA; } else { - TBM_DUMB_ERROR("error Invalid argument\n"); + TBM_ERR("error Invalid argument\n"); return TBM_ERROR_INVALID_PARAMETER; } /* Check if the tbm manager supports dma fence or not. */ if (!bufmgr_dumb->use_dma_fence) { - TBM_DUMB_ERROR("Not support DMA FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); + TBM_ERR("Not support DMA FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); return TBM_ERROR_OPERATION_FAILED; } if (device == TBM_DEVICE_3D) { ret = ioctl(bo_dumb->dmabuf, DMABUF_IOCTL_GET_FENCE, &fence); if (ret < 0) { - TBM_DUMB_ERROR("Cannot set GET FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); + TBM_ERR("Cannot set GET FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); return TBM_ERROR_OPERATION_FAILED; } } else { @@ -1268,13 +1224,13 @@ tbm_dumb_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device, if (i == DMA_FENCE_LIST_MAX) { //TODO: if dma_fence list is full, it needs realloc. I will fix this. by minseok3.kim - TBM_DUMB_ERROR("fence list is full\n"); + TBM_ERR("fence list is full\n"); } } pthread_mutex_unlock(&bo_dumb->mutex); - TBM_DUMB_DEBUG("DMABUF_IOCTL_GET_FENCE! bo_dumb:%p, gem:%d(%d), fd:%ds\n", + TBM_DBG("DMABUF_IOCTL_GET_FENCE! bo_dumb:%p, gem:%d(%d), fd:%ds\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf); @@ -1305,12 +1261,12 @@ tbm_dumb_bo_unlock(tbm_backend_bo_data *bo_data) dma_type = 1; if (!bo_dumb->dma_fence[0].ctx && dma_type) { - TBM_DUMB_DEBUG("FENCE not support or ignored,\n"); + TBM_DBG("FENCE not support or ignored,\n"); return TBM_ERROR_OPERATION_FAILED; } if (!bo_dumb->dma_fence[0].ctx && dma_type) { - TBM_DUMB_DEBUG("device type is not 3D/CPU,\n"); + TBM_DBG("device type is not 3D/CPU,\n"); return TBM_ERROR_OPERATION_FAILED; } @@ -1333,7 +1289,7 @@ tbm_dumb_bo_unlock(tbm_backend_bo_data *bo_data) if (dma_type) { ret = ioctl(bo_dumb->dmabuf, DMABUF_IOCTL_PUT_FENCE, &fence); if (ret < 0) { - TBM_DUMB_ERROR("Can not set PUT FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); + TBM_ERR("Can not set PUT FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE)); return TBM_ERROR_OPERATION_FAILED; } } else { @@ -1346,7 +1302,7 @@ tbm_dumb_bo_unlock(tbm_backend_bo_data *bo_data) return TBM_ERROR_OPERATION_FAILED; } - TBM_DUMB_DEBUG("DMABUF_IOCTL_PUT_FENCE! bo_dumb:%p, gem:%d(%d), fd:%ds\n", + TBM_DBG("DMABUF_IOCTL_PUT_FENCE! bo_dumb:%p, gem:%d(%d), fd:%ds\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf); @@ -1373,14 +1329,14 @@ tbm_dumb_bo_export_fd(tbm_backend_bo_data *bo_data, tbm_error_e *error) arg.handle = bo_dumb->gem; ret = drmIoctl(bo_dumb->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg); if (ret) { - TBM_DUMB_ERROR("bo_dumb:%p Cannot dmabuf=%d (%s)\n", + TBM_ERR("bo_dumb:%p Cannot dmabuf=%d (%s)\n", bo_dumb, bo_dumb->gem, strerror_r(errno, buf, STRERR_BUFSIZE)); if (error) *error = TBM_ERROR_OPERATION_FAILED; return (tbm_fd) ret; } - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d, size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, key_fd:%d, flags:%d, size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -1405,14 +1361,14 @@ tbm_dumb_bo_export_key(tbm_backend_bo_data *bo_data, tbm_error_e *error) if (!bo_dumb->name) { bo_dumb->name = _get_name(bo_dumb->fd, bo_dumb->gem); if (!bo_dumb->name) { - TBM_DUMB_ERROR("error Cannot get name\n"); + TBM_ERR("error Cannot get name\n"); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return 0; } } - TBM_DUMB_DEBUG(" bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d, size:%d\n", + TBM_DBG(" bo_dumb:%p, gem:%d(%d), fd:%d, flags:%d, size:%d\n", bo_dumb, bo_dumb->gem, bo_dumb->name, bo_dumb->dmabuf, @@ -1481,7 +1437,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) char buf[1]; if (!bufmgr) { - TBM_DUMB_ERROR("bufmgr is null.\n"); + TBM_ERR("bufmgr is null.\n"); if (error) *error = TBM_ERROR_INVALID_PARAMETER; return NULL; @@ -1489,7 +1445,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) bufmgr_dumb = calloc(1, sizeof(struct _tbm_bufmgr_dumb)); if (!bufmgr_dumb) { - TBM_DUMB_ERROR("fail to alloc bufmgr_dumb!\n"); + TBM_ERR("fail to alloc bufmgr_dumb!\n"); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; return NULL; @@ -1500,7 +1456,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) if (bufmgr_dumb->fd < 0) { bufmgr_dumb->fd = _tbm_dumb_open_drm(); if (bufmgr_dumb->fd < 0) { - TBM_DUMB_ERROR("fail to open drm!\n"); + TBM_ERR("fail to open drm!\n"); if (error) *error = TBM_ERROR_OPERATION_FAILED; goto fail_open_drm; @@ -1511,7 +1467,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) bufmgr_dumb->device_name = drmGetDeviceNameFromFd(bufmgr_dumb->fd); if (!bufmgr_dumb->device_name) { - TBM_DUMB_ERROR("fail to get device name!\n"); + TBM_ERR("fail to get device name!\n"); tbm_drm_helper_unset_tbm_master_fd(); if (error) *error = TBM_ERROR_OPERATION_FAILED; @@ -1520,7 +1476,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) tbm_drm_helper_set_fd(bufmgr_dumb->fd); } else { if (!tbm_drm_helper_get_auth_info(&(bufmgr_dumb->fd), &(bufmgr_dumb->device_name), NULL)) { - TBM_DUMB_ERROR("fail to get auth drm info!\n"); + TBM_ERR("fail to get auth drm info!\n"); if (error) *error = TBM_ERROR_OPERATION_FAILED; goto fail_get_auth_info; @@ -1530,7 +1486,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) ret = drmGetCap(bufmgr_dumb->fd, DRM_CAP_DUMB_BUFFER, &cap); if (ret || cap == 0) { - TBM_DUMB_ERROR("drm buffer isn't supported !\n"); + TBM_ERR("drm buffer isn't supported !\n"); if (error) *error = TBM_ERROR_OPERATION_FAILED; goto fail_get_cap; @@ -1553,7 +1509,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) /* alloc and register bufmgr_funcs */ bufmgr_func = tbm_backend_bufmgr_alloc_bufmgr_func(bufmgr, &err); if (!bufmgr_func) { - TBM_DUMB_ERROR("fail to alloc bufmgr_func! err(%d)\n", err); + TBM_ERR("fail to alloc bufmgr_func! err(%d)\n", err); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; goto fail_alloc_bufmgr_func; @@ -1571,7 +1527,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) err = tbm_backend_bufmgr_register_bufmgr_func(bufmgr, bufmgr_func); if (err != TBM_ERROR_NONE) { - TBM_DUMB_ERROR("fail to register bufmgr_func! err(%d)\n", err); + TBM_ERR("fail to register bufmgr_func! err(%d)\n", err); if (error) *error = TBM_ERROR_OPERATION_FAILED; goto fail_register_bufmgr_func; @@ -1581,7 +1537,7 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) /* alloc and register bo_funcs */ bo_func = tbm_backend_bufmgr_alloc_bo_func(bufmgr, &err); if (!bo_func) { - TBM_DUMB_ERROR("fail to alloc bo_func! err(%d)\n", err); + TBM_ERR("fail to alloc bo_func! err(%d)\n", err); if (error) *error = TBM_ERROR_OUT_OF_MEMORY; goto fail_alloc_bo_func; @@ -1600,27 +1556,15 @@ tbm_dumb_init(tbm_bufmgr bufmgr, tbm_error_e *error) err = tbm_backend_bufmgr_register_bo_func(bufmgr, bo_func); if (err != TBM_ERROR_NONE) { - TBM_DUMB_ERROR("fail to register bo_func! err(%d)\n", err); + TBM_ERR("fail to register bo_func! err(%d)\n", err); if (error) *error = TBM_ERROR_OPERATION_FAILED; goto fail_register_bo_func; } bufmgr_dumb->bo_func = bo_func; -#ifdef DEBUG - { - char* env; - env = getenv("TBM_DUMB_DEBUG"); - if (env) { - bDebug = atoi(env); - TBM_DUMB_ERROR("TBM_DUMB_DEBUG=%s\n", env); - } else - bDebug = 0; - } -#endif - - TBM_DUMB_DEBUG("DMABUF FENCE is %s\n", bufmgr_dumb->use_dma_fence ? "supported!" : "NOT supported!"); - TBM_DUMB_DEBUG("drm_fd:%d\n", bufmgr_dumb->fd); + TBM_DBG("DMABUF FENCE is %s\n", bufmgr_dumb->use_dma_fence ? "supported!" : "NOT supported!"); + TBM_DBG("drm_fd:%d\n", bufmgr_dumb->fd); if (error) *error = TBM_ERROR_NONE;