From b30f3bec2f80eb79fd2c830284ef9896d8606aae Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Mon, 16 Sep 2019 16:45:34 -0400
Subject: [PATCH] P4 to Git Change 1998942 by
 vsytchen@vsytchen-remote-ocl-win10 on 2019/09/16 16:38:10

	SWDEV-79445 - OCL generic changes and code clean-up

	1. Add Van Gogh device ID

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/17992/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#60 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#162 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#97 edit


[ROCm/clr commit: d8f94162046af3bc09559f73952ecbdbbabd6573]
---
 projects/clr/rocclr/runtime/device/pal/paldefs.hpp   | 4 ++++
 projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
index b5c736ce76..4bf9ba0ce3 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
@@ -189,6 +189,10 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* UnknownDevice3 XNACK    */ UnknownDevice,
     /* UnknownDevice2      */ UnknownDevice,
     /* UnknownDevice2XNACK */ UnknownDevice,
+    /* UnknownDevice7           */ UnknownDevice,
+    /* UnknownDevice7 XNACK     */ UnknownDevice,
+    /* UnknownDevice6       */ UnknownDevice,
+    /* UnknownDevice6 XNACK */ UnknownDevice,
 };
 
 // Supported OpenCL versions
diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index b4e0cb81f0..7c2e71ec6c 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -183,6 +183,9 @@ bool NullDevice::init() {
           case 3:
             ShouldNotReachHere();
             break;
+          case 4:
+            ShouldNotReachHere();
+            break;
         }
     }
 
@@ -224,6 +227,9 @@ bool NullDevice::init() {
       case 1030:
         ShouldNotReachHere();
         break;
+      case 1040:
+        ShouldNotReachHere();
+        break;
     }
 
     NullDevice* dev = new NullDevice();