use tbm_log.h

Change-Id: I4cb5411e892e3dab07c9edab523ffbbe78af333f

diff --git a/src/tbm_bufmgr_sprd.c b/src/tbm_bufmgr_sprd.c
index afe29f1..874deb0 100644 (file)
--- a/src/tbm_bufmgr_sprd.c
+++ b/src/tbm_bufmgr_sprd.c
@@ -74,21 +74,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define TBM_SURFACE_ALIGNMENT_PITCH_RGB (128)
 #define TBM_SURFACE_ALIGNMENT_PITCH_YUV (16)
 
-
-/* check condition */
-#define SPRD_RETURN_IF_FAIL(cond) {\
-       if (!(cond)) {\
-               TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\
-               return;\
-       } \
-}
-#define SPRD_RETURN_VAL_IF_FAIL(cond, val) {\
-       if (!(cond)) {\
-               TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\
-               return val;\
-       } \
-}
-
 struct dma_buf_info {
        unsigned long   size;
        unsigned int    fence_supported;
@@ -451,7 +436,7 @@ _tbm_sprd_open_drm(void)
 static int
 _sprd_bo_cache_flush(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd, int flags)
 {
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
+       TBM_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)
@@ -507,8 +492,8 @@ static int
 _bo_init_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd, int import)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
 
        if (bufmgr_sprd->use_dma_fence)
                return 1;
@@ -533,8 +518,8 @@ static int
 _bo_set_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd, int device, int opt)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
 
        char need_flush = 0;
        unsigned short cntFlush = 0;
@@ -599,8 +584,8 @@ static int
 _bo_save_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bo_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
 
        if (bufmgr_sprd->use_dma_fence)
                return 1;
@@ -622,8 +607,8 @@ static void
 _bo_destroy_cache_state(tbm_bufmgr_sprd bufmgr_sprd, tbm_bo_sprd bo_sprd)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_IF_FAIL(bo_sprd != NULL);
-       SPRD_RETURN_IF_FAIL(bufmgr_sprd != NULL);
+       TBM_RETURN_IF_FAIL(bo_sprd != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_sprd != NULL);
 
        if (bufmgr_sprd->use_dma_fence)
                return;
@@ -636,7 +621,7 @@ static int
 _bufmgr_init_cache_state(tbm_bufmgr_sprd bufmgr_sprd)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, 0);
 
        if (bufmgr_sprd->use_dma_fence)
                return 1;
@@ -673,7 +658,7 @@ static void
 _bufmgr_deinit_cache_state(tbm_bufmgr_sprd bufmgr_sprd)
 {
 #ifdef USE_CACHE
-       SPRD_RETURN_IF_FAIL(bufmgr_sprd != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_sprd != NULL);
 
        if (bufmgr_sprd->use_dma_fence)
                return;
@@ -833,7 +818,7 @@ static tbm_error_e
 tbm_sprd_bufmgr_bind_native_display(tbm_backend_bufmgr_data *bufmgr_data, tbm_native_display *native_display)
 {
        tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)bufmgr_data;
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        if (!tbm_drm_helper_wl_auth_server_init(native_display, bufmgr_sprd->fd,
                                           bufmgr_sprd->device_name, 0)) {
@@ -853,7 +838,7 @@ tbm_sprd_bufmgr_get_supported_formats(tbm_backend_bufmgr_data *bufmgr_data,
        tbm_bufmgr_sprd bufmgr_sprd = (tbm_bufmgr_sprd)bufmgr_data;
        uint32_t *color_formats;
 
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        color_formats = (uint32_t *)calloc(1, sizeof(uint32_t) * TBM_COLOR_FORMAT_COUNT);
        if (color_formats == NULL)
@@ -883,7 +868,7 @@ tbm_sprd_bufmgr_get_plane_data(tbm_backend_bufmgr_data *bufmgr_data,
        int _bo_idx = 0;
        int _align_height = 0;
 
-       SPRD_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
+       TBM_RETURN_VAL_IF_FAIL(bufmgr_sprd != NULL, TBM_ERROR_INVALID_PARAMETER);
 
        switch (format) {
                /* 16 bpp RGB */
@@ -1749,7 +1734,7 @@ tbm_sprd_deinit(tbm_backend_bufmgr_data *bufmgr_data)
        unsigned long key;
        void *value;
 
-       SPRD_RETURN_IF_FAIL(bufmgr_sprd != NULL);
+       TBM_RETURN_IF_FAIL(bufmgr_sprd != NULL);
 
        bufmgr = bufmgr_sprd->bufmgr;