[Bf-blender-cvs] [2d472b70e5a] master: Revert "Cycles: enable HIP for Vega and Vega II (Radeon 7) GPUs on Windows"

[Brecht Van Lommel]

Commit: 2d472b70e5ae22ece199003f51742a72f485fd87
Author: Brecht Van Lommel
Date:   Tue Apr 12 19:17:47 2022 +0200
Branches: master
https://developer.blender.org/rB2d472b70e5ae22ece199003f51742a72f485fd87

Revert "Cycles: enable HIP for Vega and Vega II (Radeon 7) GPUs on Windows"

This is not currently working, reverting until the driver/compiler has a fix.

This reverts commit c46e58817cd72d1481967d32e3c6f47f42933d39.

===================================================================

M	CMakeLists.txt
M	intern/cycles/blender/addon/properties.py
M	intern/cycles/device/hip/util.h

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca457ab6b37..cc39429742e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,7 +446,7 @@ if(NOT APPLE)
   endif()
 
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx900 gfx906 gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
   mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index ee051766c50..ed054b041d8 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1507,7 +1507,7 @@ class CyclesPreferences(bpy.types.AddonPreferences):
                 col.label(text="and NVIDIA driver version 470 or newer", icon='BLANK1')
             elif device_type == 'HIP':
                 import sys
-                col.label(text="Requires discrete AMD GPU with Vega architecture", icon='BLANK1')
+                col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                 if sys.platform[:3] == "win":
                     col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1')
             elif device_type == 'METAL':
diff --git a/intern/cycles/device/hip/util.h b/intern/cycles/device/hip/util.h
index 4e4906171d1..adb68a2d44c 100644
--- a/intern/cycles/device/hip/util.h
+++ b/intern/cycles/device/hip/util.h
@@ -51,7 +51,7 @@ static inline bool hipSupportsDevice(const int hipDevId)
   hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId);
   hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId);
 
-  return (major >= 9);
+  return (major > 10) || (major == 10 && minor >= 1);
 }
 
 CCL_NAMESPACE_END