From 37836c8baaddb6a5cdecebdc901c929751e1abc0 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Fri, 19 Jul 2019 17:35:11 -0400
Subject: [PATCH] P4 to Git Change 1970940 by
 vsytchen@vsytchen-remote-ocl-win10 on 2019/07/19 17:25:51

	SWDEV-196420 - Enable NV12 for OpenCL mainline

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

Affected files ...

... //depot/stg/opencl/drivers/opencl/library/build/Makefile.library#83 integrate
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#44 integrate
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#57 integrate
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#149 integrate
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#91 integrate


[ROCm/clr commit: abb6a88458087da7e89c633ccb52794ecf899acc]
---
 projects/clr/rocclr/runtime/device/pal/paldefs.hpp     | 4 ++--
 projects/clr/rocclr/runtime/device/pal/paldevice.cpp   | 2 +-
 projects/clr/rocclr/runtime/device/pal/palsettings.cpp | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
index 56c8d305f9..c95b3b1c56 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
@@ -179,8 +179,8 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Navi10 XNACK    */ {"gfx1010", "gfx1010", 32, 256, 32, 1010, 1010, true},
     /* Navi10Lite      */ UnknownDevice,
     /* Navi10LiteXNACK */ UnknownDevice,
-    /* Navi12          */ UnknownDevice,
-    /* Navi12 XNACK    */ UnknownDevice,
+    /* Navi12          */ AMDDeviceInfo{"gfx1011", "gfx1011", 32, 256, 32, 1011, 1011, false},
+    /* Navi12 XNACK    */ AMDDeviceInfo{"gfx1011", "gfx1011", 32, 256, 32, 1011, 1011, true},
     /* Navi12Lite      */ UnknownDevice,
     /* Navi12LiteXNACK */ UnknownDevice,
     /* Navi14          */ {"gfx1012", "gfx1012", 32, 256, 32, 1012, 1012, false},
diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index 5deb78b1c9..f4e502b4fc 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -213,7 +213,7 @@ bool NullDevice::init() {
         revision = Pal::AsicRevision::Navi10;
         break;
       case 1011:
-        ShouldNotReachHere();
+        revision = Pal::AsicRevision::Navi12;
         break;
       case 1012:
         revision = Pal::AsicRevision::Navi14;
diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
index d0e0ca93fd..ffa4feec8b 100644
--- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
@@ -190,6 +190,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
           return false;
       }
     case Pal::AsicRevision::Navi14:
+    case Pal::AsicRevision::Navi12:
     case Pal::AsicRevision::Navi10:
     case Pal::AsicRevision::Navi10_A0:
       gfx10Plus_ = true;