use TBM_ERROR_INVALID_OPERATION

Change-Id: Icccc1180637d7c70f18da86a73569ac337b6756b

diff --git a/src/tbm_bufmgr_exynos.c b/src/tbm_bufmgr_exynos.c
index 0f13316..f56f8f7 100644 (file)
--- a/src/tbm_bufmgr_exynos.c
+++ b/src/tbm_bufmgr_exynos.c
@@ -1025,7 +1025,7 @@ tbm_exynos_bufmgr_bind_native_display(tbm_backend_bufmgr_data *bufmgr_data, tbm_
        if (!tbm_drm_helper_wl_auth_server_init(native_display, bufmgr_exynos->fd,
                                           bufmgr_exynos->device_name, 0)) {
                TBM_ERR("fail to tbm_drm_helper_wl_server_init\n");
-               return TBM_ERROR_OPERATION_FAILED;
+               return TBM_ERROR_INVALID_OPERATION;
        }
 
        bufmgr_exynos->bind_display = native_display;
@@ -1378,7 +1378,7 @@ tbm_exynos_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, unsigned int si
                               (unsigned int)arg.size);
                free(bo_exynos);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1393,7 +1393,7 @@ tbm_exynos_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, unsigned int si
                TBM_ERR("fail init cache state(%d)\n", bo_exynos->name);
                free(bo_exynos);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1407,7 +1407,7 @@ tbm_exynos_bufmgr_alloc_bo(tbm_backend_bufmgr_data *bufmgr_data, unsigned int si
                        TBM_ERR("Cannot dmabuf=%d\n", bo_exynos->gem);
                        free(bo_exynos);
                        if (error)
-                               *error = TBM_ERROR_OPERATION_FAILED;
+                               *error = TBM_ERROR_INVALID_OPERATION;
                        return NULL;
                }
                bo_exynos->dmabuf = arg.fd;
@@ -1455,7 +1455,7 @@ tbm_exynos_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tb
                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;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
        gem = arg.handle;
@@ -1465,7 +1465,7 @@ tbm_exynos_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tb
                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;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1497,7 +1497,7 @@ tbm_exynos_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tb
                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;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1524,7 +1524,7 @@ tbm_exynos_bufmgr_import_fd(tbm_backend_bufmgr_data *bufmgr_data, tbm_fd key, tb
                TBM_ERR("fail init cache state(%d)\n", bo_exynos->name);
                free(bo_exynos);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1575,7 +1575,7 @@ tbm_exynos_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key,
        if (drmIoctl(bufmgr_exynos->fd, DRM_IOCTL_GEM_OPEN, &arg)) {
                TBM_ERR("Cannot open gem name=%d\n", key);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1586,7 +1586,7 @@ tbm_exynos_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key,
                                sizeof(struct drm_exynos_gem_info))) {
                TBM_ERR("Cannot get gem info=%d\n", key);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1610,7 +1610,7 @@ tbm_exynos_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key,
                TBM_ERR("fail init cache state(%d)\n", bo_exynos->name);
                free(bo_exynos);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return NULL;
        }
 
@@ -1621,7 +1621,7 @@ tbm_exynos_bufmgr_import_key(tbm_backend_bufmgr_data *bufmgr_data, tbm_key key,
                if (drmIoctl(bo_exynos->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &arg)) {
                        TBM_ERR("fail to DRM_IOCTL_PRIME_HANDLE_TO_FD gem=%d\n", bo_exynos->gem);
                        if (error)
-                               *error = TBM_ERROR_OPERATION_FAILED;
+                               *error = TBM_ERROR_INVALID_OPERATION;
                        free(bo_exynos);
                        return NULL;
                }
@@ -1771,7 +1771,7 @@ tbm_exynos_bo_get_handle(tbm_backend_bo_data *bo_data, tbm_bo_device_type device
                TBM_ERR("Cannot get handle: gem:%d, device:%d\n",
                        bo_exynos->gem, device);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return (tbm_bo_handle) NULL;
        }
 
@@ -1822,7 +1822,7 @@ tbm_exynos_bo_map(tbm_backend_bo_data *bo_data, tbm_bo_device_type device,
                TBM_ERR("Cannot get handle: gem:%d, device:%d, opt:%d\n",
                               bo_exynos->gem, device, opt);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return (tbm_bo_handle) NULL;
        }
 
@@ -1895,7 +1895,7 @@ tbm_exynos_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device,
 
        if (device != TBM_DEVICE_3D && device != TBM_DEVICE_CPU) {
                TBM_DBG("Not support device type,\n");
-               return TBM_ERROR_OPERATION_FAILED;
+               return TBM_ERROR_INVALID_OPERATION;
        }
 
        memset(&fence, 0, sizeof(struct dma_buf_fence));
@@ -1915,7 +1915,7 @@ tbm_exynos_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device,
        /* Check if the tbm manager supports dma fence or not. */
        if (!bufmgr_exynos->use_dma_fence) {
                TBM_ERR("Not support DMA FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE));
-               return TBM_ERROR_OPERATION_FAILED;
+               return TBM_ERROR_INVALID_OPERATION;
 
        }
 
@@ -1923,7 +1923,7 @@ tbm_exynos_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device,
                ret = ioctl(bo_exynos->dmabuf, DMABUF_IOCTL_GET_FENCE, &fence);
                if (ret < 0) {
                        TBM_ERR("Cannot set GET FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE));
-                       return TBM_ERROR_OPERATION_FAILED;
+                       return TBM_ERROR_INVALID_OPERATION;
                }
        } else {
                if (opt & TBM_OPTION_WRITE)
@@ -1936,7 +1936,7 @@ tbm_exynos_bo_lock(tbm_backend_bo_data *bo_data, tbm_bo_device_type device,
                filelock.l_len = 0;
 
                if (-1 == fcntl(bo_exynos->dmabuf, F_SETLKW, &filelock))
-                       return TBM_ERROR_OPERATION_FAILED;
+                       return TBM_ERROR_INVALID_OPERATION;
        }
 
        pthread_mutex_lock(&bo_exynos->mutex);
@@ -1989,12 +1989,12 @@ tbm_exynos_bo_unlock(tbm_backend_bo_data *bo_data)
 
        if (!bo_exynos->dma_fence[0].ctx && dma_type) {
                TBM_DBG("FENCE not support or ignored,\n");
-               return TBM_ERROR_OPERATION_FAILED;
+               return TBM_ERROR_INVALID_OPERATION;
        }
 
        if (!bo_exynos->dma_fence[0].ctx && dma_type) {
                TBM_DBG("device type is not 3D/CPU,\n");
-               return TBM_ERROR_OPERATION_FAILED;
+               return TBM_ERROR_INVALID_OPERATION;
        }
 
        pthread_mutex_lock(&bo_exynos->mutex);
@@ -2017,7 +2017,7 @@ tbm_exynos_bo_unlock(tbm_backend_bo_data *bo_data)
                ret = ioctl(bo_exynos->dmabuf, DMABUF_IOCTL_PUT_FENCE, &fence);
                if (ret < 0) {
                        TBM_ERR("Can not set PUT FENCE(%s)\n", strerror_r(errno, buf, STRERR_BUFSIZE));
-                       return TBM_ERROR_OPERATION_FAILED;
+                       return TBM_ERROR_INVALID_OPERATION;
                }
        } else {
                filelock.l_type = F_UNLCK;
@@ -2026,7 +2026,7 @@ tbm_exynos_bo_unlock(tbm_backend_bo_data *bo_data)
                filelock.l_len = 0;
 
                if (-1 == fcntl(bo_exynos->dmabuf, F_SETLKW, &filelock))
-                       return TBM_ERROR_OPERATION_FAILED;
+                       return TBM_ERROR_INVALID_OPERATION;
        }
 
        TBM_DBG("DMABUF_IOCTL_PUT_FENCE! bo_exynos:%p, gem:%d(%d), fd:%ds\n",
@@ -2058,7 +2058,7 @@ tbm_exynos_bo_export_fd(tbm_backend_bo_data *bo_data, tbm_error_e *error)
                TBM_ERR("bo_exynos:%p Cannot dmabuf=%d (%s)\n",
                               bo_exynos, bo_exynos->gem, strerror_r(errno, buf, STRERR_BUFSIZE));
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                return (tbm_fd) ret;
        }
 
@@ -2186,7 +2186,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
                        if (bufmgr_exynos->fd < 0) {
                                TBM_ERR("fail to open drm!\n");
                                if (error)
-                                       *error = TBM_ERROR_OPERATION_FAILED;
+                                       *error = TBM_ERROR_INVALID_OPERATION;
                                goto fail_open_drm;
                        }
                }
@@ -2198,7 +2198,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
                        TBM_ERR("fail to get device name!\n");
                        tbm_drm_helper_unset_tbm_master_fd();
                        if (error)
-                               *error = TBM_ERROR_OPERATION_FAILED;
+                               *error = TBM_ERROR_INVALID_OPERATION;
                        goto fail_get_device_name;
                }
        } else {
@@ -2207,7 +2207,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
                        if (bufmgr_exynos->fd < 0) {
                                TBM_ERR("fail to get render node\n");
                                if (error)
-                                       *error = TBM_ERROR_OPERATION_FAILED;
+                                       *error = TBM_ERROR_INVALID_OPERATION;
                                goto fail_get_render_node;
                        }
                        TBM_DBG("Use render node:%d\n", bufmgr_exynos->fd);
@@ -2215,7 +2215,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
                        if (!tbm_drm_helper_get_auth_info(&(bufmgr_exynos->fd), &(bufmgr_exynos->device_name), NULL)) {
                                TBM_ERR("fail to get auth drm info!\n");
                                if (error)
-                                       *error = TBM_ERROR_OPERATION_FAILED;
+                                       *error = TBM_ERROR_INVALID_OPERATION;
                                goto fail_get_auth_info;
                        }
                        tbm_drm_helper_set_fd(bufmgr_exynos->fd);
@@ -2258,7 +2258,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
        if (!_bufmgr_init_cache_state(bufmgr_exynos)) {
                TBM_ERR("fail to init bufmgr cache state\n");
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                goto fail_init_cache_state;
        }
 
@@ -2288,7 +2288,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
        if (err != TBM_ERROR_NONE) {
                TBM_ERR("fail to register bufmgr_func! err(%d)\n", err);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                goto fail_register_bufmgr_func;
        }
        bufmgr_exynos->bufmgr_func = bufmgr_func;
@@ -2317,7 +2317,7 @@ tbm_exynos_init(tbm_bufmgr bufmgr, tbm_error_e *error)
        if (err != TBM_ERROR_NONE) {
                TBM_ERR("fail to register bo_func! err(%d)\n", err);
                if (error)
-                       *error = TBM_ERROR_OPERATION_FAILED;
+                       *error = TBM_ERROR_INVALID_OPERATION;
                goto fail_register_bo_func;
        }
        bufmgr_exynos->bo_func = bo_func;