From 5e60e06a50e62ad6b2bc9269ccceff86bb8723e3 Mon Sep 17 00:00:00 2001
From: Vladislav Sytchenko <Vladislav.Sytchenko@amd.com>
Date: Thu, 12 Nov 2020 10:45:40 -0500
Subject: [PATCH] [PAL] Navi22 support

Change-Id: I9f1741898b4afaa0e787d8053d8f006ee3d17017
---
 rocclr/device/pal/paldefs.hpp     | 2 ++
 rocclr/device/pal/paldevice.cpp   | 2 +-
 rocclr/device/pal/palsettings.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rocclr/device/pal/paldefs.hpp b/rocclr/device/pal/paldefs.hpp
index 878308c25e..8e378f2ce7 100644
--- a/rocclr/device/pal/paldefs.hpp
+++ b/rocclr/device/pal/paldefs.hpp
@@ -199,6 +199,8 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Navi14 XNACK        */ {"gfx1012", "gfx1012", 32, 256, 32, 1012, 1012, true, Pal::AsicRevision::Navi14},
     /* Navi21              */ {"gfx1030", "gfx1030", 32, 256, 32, 1030, 1030, false, Pal::AsicRevision::Navi21},
     /* Navi21 XNACK        */ UnknownDevice,
+    /* Navi22              */ {"gfx1031", "gfx1031", 32, 256, 32, 1031, 1031, false, Pal::AsicRevision::Navi22},
+    /* Navi22 XNACK        */ UnknownDevice,
 };
 
 // Supported OpenCL versions
diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp
index b688a60856..aaed9ee4e1 100644
--- a/rocclr/device/pal/paldevice.cpp
+++ b/rocclr/device/pal/paldevice.cpp
@@ -261,7 +261,7 @@ bool NullDevice::init() {
         revision = Pal::AsicRevision::Navi21;
         break;
       case 1031:
-        ShouldNotReachHere();
+        revision = Pal::AsicRevision::Navi22;
         break;
       case 1032:
         ShouldNotReachHere();
diff --git a/rocclr/device/pal/palsettings.cpp b/rocclr/device/pal/palsettings.cpp
index a0f73e7546..1d60395377 100644
--- a/rocclr/device/pal/palsettings.cpp
+++ b/rocclr/device/pal/palsettings.cpp
@@ -203,6 +203,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
   }
 
   switch (palProp.revision) {
+    case Pal::AsicRevision::Navi22:
     case Pal::AsicRevision::Navi21:
     case Pal::AsicRevision::Navi14:
     case Pal::AsicRevision::Navi12: