Skip to content

Commit 450fa53

Browse files
committed
Check ddiInit before reading init drivers
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent 1d5c8e6 commit 450fa53

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/templates/ldrddi.cpp.mako

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ namespace loader
192192
if(drv.initStatus != ZE_RESULT_SUCCESS || drv.initSysManStatus != ZE_RESULT_SUCCESS || !drv.ddiInitialized)
193193
continue;
194194
%else:
195-
if (!drv.dditable.${n}.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)}) {
195+
if (!drv.ddiInitialized || !drv.dditable.${n}.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)}) {
196196
%if re.match(r"\w+InitDrivers$", th.make_func_name(n, tags, obj)):
197197
drv.initDriversStatus = ${X}_RESULT_ERROR_UNINITIALIZED;
198198
result = ${X}_RESULT_ERROR_UNINITIALIZED;

source/loader/ze_ldrddi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ namespace loader
374374

375375
for( auto& drv : loader::context->zeDrivers )
376376
{
377-
if (!drv.dditable.ze.Global.pfnInitDrivers) {
377+
if (!drv.ddiInitialized || !drv.dditable.ze.Global.pfnInitDrivers) {
378378
drv.initDriversStatus = ZE_RESULT_ERROR_UNINITIALIZED;
379379
result = ZE_RESULT_ERROR_UNINITIALIZED;
380380
continue;

0 commit comments

Comments
 (0)