P4 to Git Change 2011927 by gandryey@gera-win10 on 2019/10/10 17:24:46

SWDEV-79445 - OCL generic changes and code clean-up
	- Restore xnack support for Navi1x HW(requires COMGR support). Only Navi2x should have a fix in HW

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#64 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#173 edit

rocclr/runtime/device/pal/paldevice.cpp

@@ -905,7 +905,8 @@ bool Device::create(Pal::IDevice* device) {
   asicRevision_ = properties().revision;
 
   // XNACK flag should be set for  PageMigration | IOMMUv2 Support
-  uint isXNACKSupported = (ipLevel_ < Pal::GfxIpLevel::GfxIp10_1) &&
+  // Note: Navi2x should have a fix in HW
+  uint isXNACKSupported = (ipLevel_ <= Pal::GfxIpLevel::GfxIp10_1) &&
       (static_cast<uint>(properties_.gpuMemoryProperties.flags.pageMigrationEnabled ||
                          properties_.gpuMemoryProperties.flags.iommuv2Support));
   uint subtarget = isXNACKSupported;