From 4bb8a13cfee944d1f13a142cc60a996a3c8bf2e6 Mon Sep 17 00:00:00 2001 From: foreman Date: Sun, 21 Jan 2018 20:56:24 -0500 Subject: [PATCH] P4 to Git Change 1506005 by skudchad@skudchad_test2_win_opencl on 2018/01/21 20:49:00 SWDEV-143358 - [IV][Redstone3_64]Crashed observed while running CLinfo and Opencl samples are not starting on AI BAFFIN,AI ELLESMERE,VEGA,RAVEN,AI LEXA. - Return false if KMTQAITYPE_QUERYREGISTRY query fails for D3DKMTQueryAdapterInfo Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c#2 edit --- opencl/api/opencl/khronos/icd/icd_windows_dxgk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c b/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c index b1c4d562a6..adf66ad2e2 100644 --- a/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c +++ b/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c @@ -91,6 +91,11 @@ bool khrIcdOsVendorsEnumerateDXGK(void) QueryAdapterInfo.pPrivateDriverData = &QueryArgs; QueryAdapterInfo.PrivateDriverDataSize = sizeof(QueryArgs); Status = D3DKMTQueryAdapterInfo(&QueryAdapterInfo); + if (!NT_SUCCESS(Status)) + { + if (pAdapterInfo) free(pAdapterInfo); + return FALSE; + } if (NT_SUCCESS(Status) && pQueryArgs->Status == D3DDDI_QUERYREGISTRY_STATUS_BUFFER_OVERFLOW) { unsigned int QueryBufferSize = sizeof(D3DDDI_QUERYREGISTRY_INFO) + QueryArgs.OutputValueSize;