[Bf-blender-cvs] [179100c0212] master: Cycles: enable AMD RDNA GPU support on Linux

[Brecht Van Lommel]

Commit: 179100c021269c278396c9a8039a0b75703c5f3a
Author: Brecht Van Lommel
Date:   Fri Apr 22 00:02:05 2022 +0200
Branches: master
https://developer.blender.org/rB179100c021269c278396c9a8039a0b75703c5f3a

Cycles: enable AMD RDNA GPU support on Linux

This enables building of HIP binaries for AMD RDNA and RDNA2 GPUs.

This requires the 22.10 / ROCm 5.1 driver.

Ref T91571

Differential Revision: https://developer.blender.org/D14360

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

M	CMakeLists.txt
M	intern/cycles/blender/addon/properties.py

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cc9466c2ba..3a80fefac8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,12 +439,7 @@ endif()
 
 # AMD HIP
 if(NOT APPLE)
-  if(WIN32)
-    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
-  else()
-    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
-  endif()
-
+  option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
   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)
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 715561ba03d..a0ceb9c3c29 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1516,9 +1516,12 @@ 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 RDNA architecture", icon='BLANK1')
                 if sys.platform[:3] == "win":
+                    col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
                     col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1')
+                elif sys.platform.startswith("linux"):
+                    col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
+                    col.label(text="and AMD driver version 22.10 or newer", icon='BLANK1')
             elif device_type == 'METAL':
                 col.label(text="Requires Apple Silicon with macOS 12.2 or newer", icon='BLANK1')
                 col.label(text="or AMD with macOS 12.3 or newer", icon='BLANK1')