Always Set lock backend fuction 35/63135/2 accepted/tizen/common/20160323.185219 accepted/tizen/ivi/20160323.140817 accepted/tizen/mobile/20160323.135417 accepted/tizen/tv/20160323.135629 accepted/tizen/wearable/20160323.135415 submit/tizen/20160323.081622
authorChangyeon Lee <cyeon.lee@samsung.com>
Tue, 22 Mar 2016 07:53:35 +0000 (16:53 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Tue, 22 Mar 2016 07:55:21 +0000 (16:55 +0900)
Change-Id: I4cecebc3a4272e446a10acbca3d3d5587516f83e

src/tbm_bufmgr_dumb.c

index 1ce7624..3436f52 100755 (executable)
@@ -947,6 +947,9 @@ tbm_dumb_bo_lock(tbm_bo bo, int device, int opt)
     bufmgr_dumb = (tbm_bufmgr_dumb)tbm_backend_get_bufmgr_priv(bo);
     DUMB_RETURN_VAL_IF_FAIL (bufmgr_dumb!=NULL, 0);
 
+    if (!bufmgr_dumb->use_dma_fence)
+       return 1;
+
     memset(&fence, 0, sizeof(struct dma_buf_fence));
 
     /* Check if the given type is valid or not. */
@@ -1048,6 +1051,12 @@ tbm_dumb_bo_unlock(tbm_bo bo)
     bo_dumb = (tbm_bo_dumb)tbm_backend_get_bo_priv(bo);
     DUMB_RETURN_VAL_IF_FAIL (bo_dumb!=NULL, 0);
 
+    bufmgr_dumb = (tbm_bufmgr_dumb)tbm_backend_get_bufmgr_priv(bo);
+    DUMB_RETURN_VAL_IF_FAIL (bufmgr_dumb!=NULL, 0);
+
+    if (!bufmgr_dumb->use_dma_fence)
+       return 1;
+
     if (bo_dumb->dma_fence[0].type & DMA_BUF_ACCESS_DMA)
         dma_type = 1;
 
@@ -1850,19 +1859,10 @@ init_tbm_bufmgr_priv (tbm_bufmgr bufmgr, int fd)
     bufmgr_backend->surface_get_num_bos = tbm_dumb_surface_get_num_bos;
     bufmgr_backend->bo_get_flags = tbm_dumb_bo_get_flags;
 
-    if (bufmgr_dumb->use_dma_fence)
-    {
-        bufmgr_backend->flags = (TBM_LOCK_CTRL_BACKEND | TBM_CACHE_CTRL_BACKEND);
-        bufmgr_backend->bo_lock = NULL;
-        bufmgr_backend->bo_lock2 = tbm_dumb_bo_lock;
-        bufmgr_backend->bo_unlock = tbm_dumb_bo_unlock;
-    }
-    else
-    {
-        bufmgr_backend->flags = (TBM_LOCK_CTRL_BACKEND | TBM_CACHE_CTRL_BACKEND);
-        bufmgr_backend->bo_lock = NULL;
-        bufmgr_backend->bo_unlock = NULL;
-    }
+    bufmgr_backend->flags = (TBM_LOCK_CTRL_BACKEND | TBM_CACHE_CTRL_BACKEND);
+    bufmgr_backend->bo_lock = NULL;
+    bufmgr_backend->bo_lock2 = tbm_dumb_bo_lock;
+    bufmgr_backend->bo_unlock = tbm_dumb_bo_unlock;
 
     if (!tbm_backend_init (bufmgr, bufmgr_backend))
     {