nefarius/qxl-wddm-dod
1
0
Fork 0
Code Pull Requests Activity

Compute automatically memory space in FreeMem

Browse Source 
This make easier to change allocation of memory using different
memory Bars.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Yuri Benditovich <yuri.benditovich@daynix.com>
This commit is contained in:
Frediano Ziglio 2017-04-10 14:30:56 +01:00
parent 8fb1b0a23e
commit 1b674d86e2
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
qxldod/QxlDod.cpp
View File

@ -4052,7 +4052,7 @@ UINT64 QxlDevice::ReleaseOutput(UINT64 output_id)
RELEASE_RES(*now); RELEASE_RES(*now);
} }
next = *(UINT64*)output->data; next = *(UINT64*)output->data;
FreeMem(MSPACE_TYPE_VRAM, output); FreeMem(output);
DbgPrint(TRACE_LEVEL_VERBOSE, ("<---%s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("<---%s\n", __FUNCTION__));
return next; return next;
} }
@ -4118,24 +4118,27 @@ void *QxlDevice::AllocMem(UINT32 mspace_type, size_t size, BOOL force)
return ptr; return ptr;
} }
void QxlDevice::FreeMem(UINT32 mspace_type, void *ptr) void QxlDevice::FreeMem(void *ptr)
{ {
PAGED_CODE(); PAGED_CODE();
ASSERT(m_MSInfo[mspace_type]._mspace);
DbgPrint(TRACE_LEVEL_VERBOSE, ("---> %s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("---> %s\n", __FUNCTION__));
#ifdef DBG for (const MspaceInfo *info = m_MSInfo; ; ++info)
if (!((UINT8 *)ptr >= m_MSInfo[mspace_type].mspace_start && {
(UINT8 *)ptr < m_MSInfo[mspace_type].mspace_end)) { if (info == m_MSInfo + _countof(m_MSInfo))
DbgPrint(TRACE_LEVEL_ERROR, ("ASSERT failed @ %s, %p not in [%p, %p) (%d)\n", __FUNCTION__, {
ptr, m_MSInfo[mspace_type].mspace_start, DbgPrint(TRACE_LEVEL_ERROR, ("ASSERT failed @ %s, %p not in device memory\n",
m_MSInfo[mspace_type].mspace_end, mspace_type)); __FUNCTION__, ptr));
break;
} }
#endif if (info->_mspace && ptr >= info->mspace_start && ptr < info->mspace_end)
BOOLEAN locked = FALSE; {
locked = WaitForObject(&m_MemLock, NULL); BOOLEAN locked = WaitForObject(&m_MemLock, NULL);
mspace_free(m_MSInfo[mspace_type]._mspace, ptr); mspace_free(info->_mspace, ptr);
ReleaseMutex(&m_MemLock, locked); ReleaseMutex(&m_MemLock, locked);
break;
}
}
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
} }
@ -4258,9 +4261,9 @@ void QxlDevice::FreeClipRects(Resource *res)
while (chunk_phys) { while (chunk_phys) {
QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot); QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot);
chunk_phys = chunk->next_chunk; chunk_phys = chunk->next_chunk;
FreeMem(MSPACE_TYPE_VRAM, chunk); FreeMem(chunk);
} }
FreeMem(MSPACE_TYPE_VRAM, res); FreeMem(res);
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
} }
@ -4285,10 +4288,10 @@ void QxlDevice::FreeBitmapImage(Resource *res)
while (chunk_phys) { while (chunk_phys) {
QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot); QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot);
chunk_phys = chunk->next_chunk; chunk_phys = chunk->next_chunk;
FreeMem(MSPACE_TYPE_VRAM, chunk); FreeMem(chunk);
} }
FreeMem(MSPACE_TYPE_VRAM, res); FreeMem(res);
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
} }
@ -4310,10 +4313,10 @@ void QxlDevice::FreeCursor(Resource *res)
while (chunk_phys) { while (chunk_phys) {
QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot); QXLDataChunk *chunk = (QXLDataChunk *)VA(chunk_phys, m_SurfaceMemSlot);
chunk_phys = chunk->next_chunk; chunk_phys = chunk->next_chunk;
FreeMem(MSPACE_TYPE_VRAM, chunk); FreeMem(chunk);
} }
FreeMem(MSPACE_TYPE_VRAM, res); FreeMem(res);
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__)); DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
} }

2
qxldod/QxlDod.h
View File

@ -590,7 +590,7 @@ private:
NTSTATUS InitMonitorConfig(); NTSTATUS InitMonitorConfig();
void InitMspace(UINT32 mspace_type, UINT8 *start, size_t capacity); void InitMspace(UINT32 mspace_type, UINT8 *start, size_t capacity);
void FlushReleaseRing(); void FlushReleaseRing();
void FreeMem(UINT32 mspace_type, void *ptr); void FreeMem(void *ptr);
UINT64 ReleaseOutput(UINT64 output_id); UINT64 ReleaseOutput(UINT64 output_id);
void WaitForReleaseRing(void); void WaitForReleaseRing(void);
void EmptyReleaseRing(void); void EmptyReleaseRing(void);