[Decode] add back some mutex while it impacts vp9 drc

Jexu · Apr 17, 2024 · d24afa0 · d24afa0
1 parent d369ca9
commit d24afa0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/media_driver/linux/common/ddi/media_libva.cpp b/media_driver/linux/common/ddi/media_libva.cpp
@@ -1339,14 +1339,14 @@ VAStatus DdiMedia_MediaMemoryDecompress(PDDI_MEDIA_CONTEXT mediaCtx, DDI_MEDIA_S
         }
         else
         {
-            //DdiMediaUtil_LockMutex(&mediaCtx->SurfaceMutex);
-            //DdiMediaUtil_LockMutex(&mediaCtx->MemDecompMutex);
+            DdiMediaUtil_LockMutex(&mediaCtx->SurfaceMutex);
+            DdiMediaUtil_LockMutex(&mediaCtx->MemDecompMutex);
 
             DdiMedia_MediaSurfaceToMosResource(mediaSurface, &surface);
             DdiMedia_MediaMemoryDecompressInternal(&mosCtx, &surface);
 
-            //DdiMediaUtil_UnLockMutex(&mediaCtx->MemDecompMutex);
-            //DdiMediaUtil_UnLockMutex(&mediaCtx->SurfaceMutex);
+            DdiMediaUtil_UnLockMutex(&mediaCtx->MemDecompMutex);
+            DdiMediaUtil_UnLockMutex(&mediaCtx->SurfaceMutex);
 
             if (pCpDdiInterface)
             {
@@ -2556,12 +2556,12 @@ VAStatus DdiMedia_DestroySurfaces (
             MOS_TraceEventExt(EVENT_VA_SYNC, EVENT_TYPE_END, nullptr, 0, nullptr, 0);
         }
 
-        //DdiMediaUtil_LockMutex(&mediaCtx->SurfaceMutex);
+        DdiMediaUtil_LockMutex(&mediaCtx->SurfaceMutex);
         DdiMediaUtil_FreeSurface(surface);
         MOS_FreeMemory(surface);
         DdiMediaUtil_ReleasePMediaSurfaceFromHeap(mediaCtx->pSurfaceHeap, (uint32_t)surfaces[i]);
         mediaCtx->uiNumSurfaces--;
-        //DdiMediaUtil_UnLockMutex(&mediaCtx->SurfaceMutex);
+        DdiMediaUtil_UnLockMutex(&mediaCtx->SurfaceMutex);
     }
 
     MOS_TraceEventExt(EVENT_VA_FREE_SURFACE, EVENT_TYPE_END, nullptr, 0, nullptr, 0);
@@ -3606,7 +3606,7 @@ VAStatus DdiMedia_MapBufferInternal (
         default:
             if((buf->format != Media_Format_CPU) && (DdiMedia_MediaFormatToOsFormat(buf->format) != VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT))
             {
-                //DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
+                DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
                 // A critical section starts.
                 // Make sure not to bailout with a return until the section ends.
 
@@ -3626,7 +3626,7 @@ VAStatus DdiMedia_MapBufferInternal (
                 }
 
                 // The critical section ends.
-                //DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
+                DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
             }
             else
             {
@@ -4078,7 +4078,7 @@ static VAStatus DdiMedia_StatusCheck (
     PDDI_DECODE_CONTEXT decCtx = (PDDI_DECODE_CONTEXT)surface->pDecCtx;
     if (decCtx && surface->curCtxType == DDI_MEDIA_CONTEXT_TYPE_DECODER)
     {
-        //DdiMediaUtil_LockGuard guard(&mediaCtx->SurfaceMutex);
+        DdiMediaUtil_LockGuard guard(&mediaCtx->SurfaceMutex);
 
         Codechal *codecHal = decCtx->pCodecHal;
         //return success just avoid vaDestroyContext is ahead of vaSyncSurface

diff --git a/media_driver/linux/common/ddi/media_libva_common.cpp b/media_driver/linux/common/ddi/media_libva_common.cpp
@@ -388,10 +388,10 @@ DDI_MEDIA_BUFFER* DdiMedia_GetBufferFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx,
 
 bool DdiMedia_DestroyBufFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx, VABufferID bufferID)
 {
-    //DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
+    DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
     DdiMediaUtil_ReleasePMediaBufferFromHeap(mediaCtx->pBufferHeap, bufferID);
     mediaCtx->uiNumBufs--;
-    //DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
+    DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
     return true;
 }