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

Avoid assert printout upon fallback of memory allocation

Browse Source 
If the memory was requested from VRAM area but finally allocated
from DEVRAM, set memory space variable for correct verification
of allocated pointer

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Yuri Benditovich 2017-04-12 16:26:30 +03:00 committed by Frediano Ziglio
parent 54a719e14f
commit decf2c9035
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qxldod/QxlDod.cpp
View File

@ -4077,8 +4077,11 @@ void *QxlDevice::AllocMem(UINT32 mspace_type, size_t size, BOOL force)
FlushReleaseRing();
ptr = mspace_malloc(m_MSInfo[mspace_type]._mspace, size);
if (!ptr && mspace_type == MSPACE_TYPE_VRAM)
ptr = mspace_malloc(m_MSInfo[MSPACE_TYPE_DEVRAM]._mspace, size);
if (!ptr && mspace_type == MSPACE_TYPE_VRAM &&
(ptr = mspace_malloc(m_MSInfo[MSPACE_TYPE_DEVRAM]._mspace, size))) {
/* for proper address check at the end of the procedure */
mspace_type = MSPACE_TYPE_DEVRAM;
}
if (ptr) {
break;
}