P4 to Git Change 1369302 by todli@todli-win-opencl-kv1 on 2017/02/04 00:49:06

SWDEV-107271 - Fix crash that happens when Resource::create() fails and "owner" gets cleared. This is only triggered by Conformance test Basic progvar_prog_scope_misc on Raven with 16GB memory (8GB is fine), but should be a general bug.
	http://ocltc.amd.com/reviews/r/12253

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.cpp#11 edit
Этот коммит содержится в:
foreman
2017-02-04 00:59:54 -05:00
родитель 28f7b5b678
Коммит c2ca879dec
+2 -2
Просмотреть файл
@@ -139,7 +139,7 @@ Memory::create(
// Local to Persistent
if (memoryType() == Local) {
// For dgpu freeMemory[0] reports a sum of visible+invisible fb
if (owner()->getSize() > (freeMemory[0] * Ki)) {
if (size() > (freeMemory[0] * Ki)) {
break;
}
memType = Persistent;
@@ -153,7 +153,7 @@ Memory::create(
memType = RemoteUSWC;
}
else if (dev().settings().apuSystem_ && memoryType() == RemoteUSWC) {
if (owner()->getSize() > (freeMemory[0] * Ki)) {
if (size() > (freeMemory[0] * Ki)) {
break;
}
}