mirror of
https://github.com/NVIDIA/open-gpu-kernel-modules.git
synced 2025-03-14 09:29:24 +01:00
Merge 2bf606cd904942782d65bff8de693206689f9961 into 25bef4626e6c5ccf5b433e1c22b6b1bd59e6f1bd
This commit is contained in:
commit
f7abab865e
@ -187,6 +187,13 @@ kfifoChidMgrConstruct_IMPL
|
||||
pKernelFifo->ppChidMgr[i]->runlistId = i;
|
||||
|
||||
pKernelFifo->ppChidMgr[i]->pChanGrpTree = portMemAllocNonPaged(sizeof(KernelChannelGroupMap));
|
||||
if (pKernelFifo->ppChidMgr[i]->pChanGrpTree == NULL)
|
||||
{
|
||||
status = NV_ERR_NO_MEMORY;
|
||||
NV_PRINTF(LEVEL_ERROR, "Failed to allocate pFifo->pChidMgr[%d]->pChanGrpTree\n", i);
|
||||
DBG_BREAKPOINT();
|
||||
goto fail;
|
||||
}
|
||||
mapInitIntrusive(pKernelFifo->ppChidMgr[i]->pChanGrpTree);
|
||||
|
||||
status = _kfifoChidMgrAllocChidHeaps(pGpu, pKernelFifo, pKernelFifo->ppChidMgr[i]);
|
||||
@ -224,8 +231,10 @@ kfifoChidMgrDestruct_IMPL
|
||||
{
|
||||
if (pKernelFifo->ppChidMgr[i] != NULL)
|
||||
{
|
||||
mapDestroy(pKernelFifo->ppChidMgr[i]->pChanGrpTree);
|
||||
portMemFree(pKernelFifo->ppChidMgr[i]->pChanGrpTree);
|
||||
if (pKernelFifo->ppChidMgr[i]->pChanGrpTree != NULL) {
|
||||
mapDestroy(pKernelFifo->ppChidMgr[i]->pChanGrpTree);
|
||||
portMemFree(pKernelFifo->ppChidMgr[i]->pChanGrpTree);
|
||||
}
|
||||
_kfifoChidMgrDestroyChidHeaps(pKernelFifo->ppChidMgr[i]);
|
||||
_kfifoChidMgrDestroyChannelGroupMgr(pKernelFifo->ppChidMgr[i]);
|
||||
portMemFree(pKernelFifo->ppChidMgr[i]);
|
||||
@ -1595,6 +1604,7 @@ kfifoGetChannelGroup_IMPL
|
||||
)
|
||||
{
|
||||
CHID_MGR *pChidMgr = kfifoGetChidMgr(pGpu, pKernelFifo, runlistID);
|
||||
NV_ASSERT_OR_RETURN(pChidMgr != NULL, NULL);
|
||||
|
||||
return kfifoChidMgrGetKernelChannelGroup(pGpu, pKernelFifo, pChidMgr, grpID);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user