use tbm_log.h

Change-Id: I8530afdf2e84ba90584964b94063f05ccde87625

diff --git a/src/tbm_bufmgr_exynos.c b/src/tbm_bufmgr_exynos.c
index 43e7793..88f674a 100644 (file)
--- a/src/tbm_bufmgr_exynos.c
+++ b/src/tbm_bufmgr_exynos.c
@@ -80,21 +80,6 @@ static unsigned int g_tbm_surface_alignment_pitch_rgb;
 #define S5P_FIMV_NV12MT_HALIGN                  128
 #define S5P_FIMV_NV12MT_VALIGN                  64
 
-/* check condition */
-#define EXYNOS_RETURN_IF_FAIL(cond) {\
-       if (!(cond)) {\
-               TBM_ERR("[%s] : '%s' failed.\n", __func__, #cond);\
-               return;\
-       } \
-}
-
-#define EXYNOS_RETURN_VAL_IF_FAIL(cond, val) {\
-       if (!(cond)) {\
-               TBM_ERR("[%s] : '%s' failed.\n", __func__, #cond);\
-               return val;\
-       } \
-}
-
 /* cache control at backend */
 static unsigned int g_enable_cache_ctrl = 0;
 
@@ -377,7 +362,7 @@ _tgl_get_data(int fd, unsigned int key)
 static int
 _exynos_cache_flush(tbm_bufmgr_exynos bufmgr_exynos, tbm_bo_exynos bo_exynos, int flags)
 {
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
 
        /* cache flush is managed by kernel side when using dma-fence. */
        if (bufmgr_exynos->use_dma_fence)
@@ -432,8 +417,8 @@ _bo_init_cache_state(tbm_bufmgr_exynos bufmgr_exynos, tbm_bo_exynos bo_exynos, i
        if (!g_enable_cache_ctrl)
                return 1;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
-       EXYNOS_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
 
        if (bufmgr_exynos->use_dma_fence)
                return 1;
@@ -460,8 +445,8 @@ _bo_set_cache_state(tbm_bufmgr_exynos bufmgr_exynos, tbm_bo_exynos bo_exynos, in
        if (!g_enable_cache_ctrl)
                return 1;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
-       EXYNOS_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
 
        if (bufmgr_exynos->use_dma_fence)
                return 1;
@@ -529,8 +514,8 @@ _bo_save_cache_state(tbm_bufmgr_exynos bufmgr_exynos, tbm_bo_exynos bo_exynos)
        if (!g_enable_cache_ctrl)
                return 1;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
-       EXYNOS_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_exynos != NULL, 0);
 
        if (bufmgr_exynos->use_dma_fence)
                return 1;
@@ -555,8 +540,8 @@ _bo_destroy_cache_state(tbm_bufmgr_exynos bufmgr_exynos, tbm_bo_exynos bo_exynos
        if (!g_enable_cache_ctrl)
                return;
 
-       EXYNOS_RETURN_IF_FAIL(bufmgr_exynos != NULL);
-       EXYNOS_RETURN_IF_FAIL(bo_exynos != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_exynos != NULL);
+       TBM_RETURN_IF_FAIL(bo_exynos != NULL);
 
        if (bufmgr_exynos->use_dma_fence)
                return ;
@@ -571,7 +556,7 @@ _bufmgr_init_cache_state(tbm_bufmgr_exynos bufmgr_exynos)
        if (!g_enable_cache_ctrl)
                return 1;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, 0);
 
        if (bufmgr_exynos->use_dma_fence)
                return 1;
@@ -612,7 +597,7 @@ _bufmgr_deinit_cache_state(tbm_bufmgr_exynos bufmgr_exynos)
        if (!g_enable_cache_ctrl)
                return;
 
-       EXYNOS_RETURN_IF_FAIL(bufmgr_exynos != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_exynos != NULL);
 
        if (bufmgr_exynos->use_dma_fence)
                return;
@@ -1035,7 +1020,7 @@ static tbm_error_e
 tbm_exynos_bufmgr_bind_native_display(tbm_backend_bufmgr_data *bufmgr_data, tbm_native_display *native_display)
 {
        tbm_bufmgr_exynos bufmgr_exynos = (tbm_bufmgr_exynos)bufmgr_data;
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        if (!tbm_drm_helper_wl_auth_server_init(native_display, bufmgr_exynos->fd,
                                           bufmgr_exynos->device_name, 0)) {
@@ -1055,7 +1040,7 @@ tbm_exynos_bufmgr_get_supported_formats(tbm_backend_bufmgr_data *bufmgr_data,
        tbm_bufmgr_exynos bufmgr_exynos = (tbm_bufmgr_exynos)bufmgr_data;
        uint32_t *color_formats;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        color_formats = (uint32_t *)calloc(1, sizeof(uint32_t) * TBM_COLOR_FORMAT_COUNT);
        if (color_formats == NULL)
@@ -1084,7 +1069,7 @@ tbm_exynos_bufmgr_get_plane_data(tbm_backend_bufmgr_data *bufmgr_data,
        int _size = 0;
        int _bo_idx = 0;
 
-       EXYNOS_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_exynos != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        switch (format) {
                /* 16 bpp RGB */
@@ -2133,7 +2118,7 @@ tbm_exynos_deinit(tbm_backend_bufmgr_data *bufmgr_data)
        unsigned long key;
        void *value;
 
-       EXYNOS_RETURN_IF_FAIL(bufmgr_exynos != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_exynos != NULL);
 
        bufmgr = bufmgr_exynos->bufmgr;