Skip to content

Commit

Permalink
[Decode] add mutex to protect element in buffer heap
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jexu
Jexu committed Apr 18, 2024
1 parent 2d8855b commit 78a4bc4
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 7 deletions.
34 changes: 30 additions & 4 deletions media_driver/linux/common/ddi/media_libva.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3386,7 +3386,9 @@ VAStatus DdiMedia_MapBufferInternal (
DDI_CHK_NULL(mediaCtx->pBufferHeap, "nullptr mediaCtx->pBufferHeap", VA_STATUS_ERROR_INVALID_CONTEXT);
DDI_CHK_LESS((uint32_t)buf_id, mediaCtx->pBufferHeap->uiAllocatedHeapElements, "Invalid bufferId", VA_STATUS_ERROR_INVALID_CONTEXT);

DDI_MEDIA_BUFFER *buf = DdiMedia_GetBufferFromVABufferID(mediaCtx, buf_id);
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = DdiMedia_GetBufferElementFromVABufferID(mediaCtx, buf_id);
DDI_CHK_NULL(bufHeapElement, "nullptr bufHeapElement", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_MEDIA_BUFFER *buf = bufHeapElement->pBuffer;
DDI_CHK_NULL(buf, "nullptr buf", VA_STATUS_ERROR_INVALID_BUFFER);

// The context is nullptr when the buffer is created from DdiMedia_DeriveImage
Expand Down Expand Up @@ -3585,7 +3587,9 @@ VAStatus DdiMedia_MapBufferInternal (
break;
case VAEncMacroblockMapBufferType:
//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
bufHeapElement->lock.lock();
*pbuf = DdiMediaUtil_LockBuffer(buf, flag);
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
MOS_TraceEventExt(EVENT_VA_MAP, EVENT_TYPE_END, nullptr, 0, nullptr, 0);
if (nullptr == (*pbuf))
Expand Down Expand Up @@ -3615,6 +3619,7 @@ VAStatus DdiMedia_MapBufferInternal (
if((buf->format != Media_Format_CPU) && (DdiMedia_MediaFormatToOsFormat(buf->format) != VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT))
{
//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
bufHeapElement->lock.lock();
// A critical section starts.
// Make sure not to bailout with a return until the section ends.

Expand All @@ -3634,6 +3639,7 @@ VAStatus DdiMedia_MapBufferInternal (
}

// The critical section ends.
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
}
else
Expand Down Expand Up @@ -3672,7 +3678,9 @@ VAStatus DdiMedia_UnmapBuffer (
DDI_CHK_NULL( mediaCtx->pBufferHeap, "nullptr mediaCtx->pBufferHeap", VA_STATUS_ERROR_INVALID_CONTEXT);
DDI_CHK_LESS((uint32_t)buf_id, mediaCtx->pBufferHeap->uiAllocatedHeapElements, "Invalid buf_id", VA_STATUS_ERROR_INVALID_BUFFER);

DDI_MEDIA_BUFFER *buf = DdiMedia_GetBufferFromVABufferID(mediaCtx, buf_id);
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = DdiMedia_GetBufferElementFromVABufferID(mediaCtx, buf_id);
DDI_CHK_NULL(bufHeapElement, "nullptr buf", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_MEDIA_BUFFER *buf = bufHeapElement->pBuffer;
DDI_CHK_NULL(buf, "nullptr buf", VA_STATUS_ERROR_INVALID_BUFFER);

// The context is nullptr when the buffer is created from DdiMedia_DeriveImage
Expand Down Expand Up @@ -3745,7 +3753,9 @@ VAStatus DdiMedia_UnmapBuffer (
if((buf->format != Media_Format_CPU) &&(DdiMedia_MediaFormatToOsFormat(buf->format) != VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT))
{
//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
bufHeapElement->lock.lock();
DdiMediaUtil_UnlockBuffer(buf);
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
}
break;
Expand Down Expand Up @@ -4797,12 +4807,14 @@ VAStatus DdiMedia_CreateImage(
return VA_STATUS_ERROR_MAX_NUM_EXCEEDED;
}

bufferHeapElement->lock.lock();
bufferHeapElement->pBuffer = buf;
bufferHeapElement->pCtx = nullptr;
bufferHeapElement->uiCtxType = DDI_MEDIA_CONTEXT_TYPE_MEDIA;

vaimg->buf = bufferHeapElement->uiVaBufferID;
mediaCtx->uiNumBufs++;
bufferHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);

DdiMediaUtil_LockMutex(&mediaCtx->ImageMutex);
Expand Down Expand Up @@ -5118,12 +5130,14 @@ VAStatus DdiMedia_DeriveImage (
MOS_FreeMemory(buf);
return VA_STATUS_ERROR_MAX_NUM_EXCEEDED;
}
bufferHeapElement->lock.lock();
bufferHeapElement->pBuffer = buf;
bufferHeapElement->pCtx = nullptr;
bufferHeapElement->uiCtxType = DDI_MEDIA_CONTEXT_TYPE_MEDIA;

vaimg->buf = bufferHeapElement->uiVaBufferID;
mediaCtx->uiNumBufs++;
bufferHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);

*image = *vaimg;
Expand Down Expand Up @@ -6819,7 +6833,9 @@ VAStatus DdiMedia_AcquireBufferHandle(
PDDI_MEDIA_CONTEXT mediaCtx = DdiMedia_GetMediaContext(ctx);
DDI_CHK_NULL(mediaCtx, "Invalid Media ctx", VA_STATUS_ERROR_INVALID_CONTEXT);

DDI_MEDIA_BUFFER *buf = DdiMedia_GetBufferFromVABufferID(mediaCtx, buf_id);
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = DdiMedia_GetBufferElementFromVABufferID(mediaCtx, buf_id);
DDI_CHK_NULL(bufHeapElement, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_MEDIA_BUFFER *buf = bufHeapElement->pBuffer;
DDI_CHK_NULL(buf, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_CHK_NULL(buf->bo, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);

Expand All @@ -6836,12 +6852,14 @@ VAStatus DdiMedia_AcquireBufferHandle(
}

//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
bufHeapElement->lock.lock();
// already acquired?
if (buf->uiExportcount)
{ // yes, already acquired
// can't provide access thru another memtype
if (buf->uiMemtype != buf_info->mem_type)
{
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
return VA_STATUS_ERROR_INVALID_PARAMETER;
}
Expand All @@ -6853,6 +6871,7 @@ VAStatus DdiMedia_AcquireBufferHandle(
uint32_t flink = 0;
if (mos_bo_flink(buf->bo, &flink) != 0)
{
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
return VA_STATUS_ERROR_INVALID_BUFFER;
}
Expand All @@ -6863,6 +6882,7 @@ VAStatus DdiMedia_AcquireBufferHandle(
int32_t prime_fd = 0;
if (mos_bo_export_to_prime(buf->bo, &prime_fd) != 0)
{
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
return VA_STATUS_ERROR_INVALID_BUFFER;
}
Expand All @@ -6882,6 +6902,7 @@ VAStatus DdiMedia_AcquireBufferHandle(
buf_info->handle = buf->handle;
buf_info->mem_size = buf->uiNumElements * buf->iSize;

bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
return VA_STATUS_SUCCESS;
}
Expand All @@ -6908,13 +6929,17 @@ VAStatus DdiMedia_ReleaseBufferHandle(
PDDI_MEDIA_CONTEXT mediaCtx = DdiMedia_GetMediaContext(ctx);
DDI_CHK_NULL(mediaCtx, "Invalid Media ctx", VA_STATUS_ERROR_INVALID_CONTEXT);

DDI_MEDIA_BUFFER *buf = DdiMedia_GetBufferFromVABufferID(mediaCtx, buf_id);
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = DdiMedia_GetBufferElementFromVABufferID(mediaCtx, buf_id);
DDI_CHK_NULL(bufHeapElement, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_MEDIA_BUFFER *buf = bufHeapElement->pBuffer;
DDI_CHK_NULL(buf, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);
DDI_CHK_NULL(buf->bo, "Invalid Media Buffer", VA_STATUS_ERROR_INVALID_BUFFER);

//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
bufHeapElement->lock.lock();
if (!buf->uiMemtype || !buf->uiExportcount)
{
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);
return VA_STATUS_SUCCESS;
}
Expand All @@ -6930,6 +6955,7 @@ VAStatus DdiMedia_ReleaseBufferHandle(
}
buf->uiMemtype = 0;
}
bufHeapElement->lock.unlock();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);

if (!buf->uiExportcount && buf->bPostponedBufFree) {
Expand Down
16 changes: 13 additions & 3 deletions media_driver/linux/common/ddi/media_libva_common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,22 +380,32 @@ PDDI_MEDIA_SURFACE DdiMedia_ReplaceSurfaceWithVariant(PDDI_MEDIA_SURFACE surface
return dstSurface;
}

DDI_MEDIA_BUFFER* DdiMedia_GetBufferFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx, VABufferID bufferID)
PDDI_MEDIA_BUFFER_HEAP_ELEMENT DdiMedia_GetBufferElementFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx, VABufferID bufferID)
{
uint32_t i = 0;
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = nullptr;
PDDI_MEDIA_BUFFER buf = nullptr;

i = (uint32_t)bufferID;
DDI_CHK_LESS(i, mediaCtx->pBufferHeap->uiAllocatedHeapElements, "invalid buffer id", nullptr);
//DdiMediaUtil_LockMutex(&mediaCtx->BufferMutex);
mediaCtx->pBufferHeap->lock.lock_shared();
bufHeapElement = (PDDI_MEDIA_BUFFER_HEAP_ELEMENT)mediaCtx->pBufferHeap->pHeapBase;
bufHeapElement += i;
buf = bufHeapElement->pBuffer;
mediaCtx->pBufferHeap->lock.unlock_shared();
//DdiMediaUtil_UnLockMutex(&mediaCtx->BufferMutex);

return bufHeapElement;
}


DDI_MEDIA_BUFFER* DdiMedia_GetBufferFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx, VABufferID bufferID)
{
PDDI_MEDIA_BUFFER_HEAP_ELEMENT bufHeapElement = nullptr;
PDDI_MEDIA_BUFFER buf = nullptr;

bufHeapElement = DdiMedia_GetBufferElementFromVABufferID(mediaCtx, bufferID);
buf = bufHeapElement != nullptr? bufHeapElement->pBuffer : nullptr;

return buf;
}

Expand Down
13 changes: 13 additions & 0 deletions media_driver/linux/common/ddi/media_libva_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,19 @@ PDDI_MEDIA_SURFACE DdiMedia_ReplaceSurfaceWithVariant(PDDI_MEDIA_SURFACE surface
//!
VASurfaceID DdiMedia_GetVASurfaceIDFromSurface(PDDI_MEDIA_SURFACE surface);

//!
//! \brief Get buffer element from VA buffer ID
//!
//! \param [in] mediaCtx
//! Pointer to ddi media context
//! \param [in] bufferID
//! VA buffer ID
//!
//! \return PDDI_MEDIA_BUFFER_HEAP_ELEMENT
//! Pointer to ddi media buffer element
//!
PDDI_MEDIA_BUFFER_HEAP_ELEMENT DdiMedia_GetBufferElementFromVABufferID (PDDI_MEDIA_CONTEXT mediaCtx, VABufferID bufferID);

//!
//! \brief Get buffer from VA buffer ID
//!
Expand Down

0 comments on commit 78a4bc4

Please sign in to comment.