From 77b6f9c6e72a871ca36628d150f18d209e1d447e Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Fri, 28 Jun 2019 14:50:33 -0400
Subject: [PATCH] P4 to Git Change 1918730 by
 vsytchen@vsytchen-remote-ocl-win10 on 2019/06/28 14:40:48

	SWDEV-193973 - [OpenCL][NV21] Add support for Navi21

	1. Add missing mainline checks

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#148 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#88 edit
---
 rocclr/runtime/device/pal/palcounters.cpp | 2 +-
 rocclr/runtime/device/pal/paldevice.cpp   | 2 +-
 rocclr/runtime/device/pal/palsettings.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rocclr/runtime/device/pal/palcounters.cpp b/rocclr/runtime/device/pal/palcounters.cpp
index c4c1d3c9bd..7897e1bec3 100644
--- a/rocclr/runtime/device/pal/palcounters.cpp
+++ b/rocclr/runtime/device/pal/palcounters.cpp
@@ -670,7 +670,7 @@ void PerfCounter::convertInfo() {
         info_.counterIndex_ = std::get<1>(p);
       }
       break;
-    case Pal::GfxIpLevel::GfxIp10_1::
+    case Pal::GfxIpLevel::GfxIp10_1:
       if (info_.blockIndex_ < gfx10BlockIdPal.size()) {
         auto p = gfx10BlockIdPal[info_.blockIndex_];
         info_.blockIndex_ = std::get<0>(p);
diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index 8b0d17e1aa..5deb78b1c9 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -181,7 +181,7 @@ bool NullDevice::init() {
             ShouldNotReachHere();
             break;
           case 3:
-            ipLevel = Pal::GfxIpLevel::GfxIp10_3;
+            ShouldNotReachHere();
             break;
         }
     }
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 803371dcd0..9b1e656e3d 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -471,7 +471,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
   }
 
   if (useLightning_) {
-    switch (palProp.gfxLevel) {:
+    switch (palProp.gfxLevel) {
       case Pal::GfxIpLevel::GfxIp10_1:
       case Pal::GfxIpLevel::GfxIp9:
         singleFpDenorm_ = true;