Skip to content

Commit 037b468

Browse files
author
Tom Doherty
committed
Recognise newer AMD GPU devices
1 parent 0dc964f commit 037b468

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

changelog/67058.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Recognise newer AMD GPU devices

salt/grains/core.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,12 @@ def _linux_gpu_data():
286286
"matrox",
287287
"aspeed",
288288
]
289-
gpu_classes = ("vga compatible controller", "3d controller", "display controller")
289+
gpu_classes = (
290+
"3d controller",
291+
"display controller",
292+
"processing accelerators",
293+
"vga compatible controller",
294+
)
290295

291296
devs = []
292297
try:

tests/pytests/unit/grains/test_core.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,6 +3379,12 @@ def _cmd_side_effect(cmd):
33793379
"Vega [Radeon RX Vega]]",
33803380
"amd",
33813381
], # AMD
3382+
[
3383+
"Processing accelerators",
3384+
"Advanced Micro Devices, Inc. [AMD/ATI]",
3385+
"Device X",
3386+
"amd",
3387+
], # AMD
33823388
[
33833389
"Audio device",
33843390
"Advanced Micro Devices, Inc. [AMD/ATI]",

0 commit comments

Comments
 (0)