From 1ecd39ba24adb8de07998efa77c78403f6cbd977 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Tue, 28 Mar 2017 17:24:27 +0300
Subject: detect amdgpu (mga#20538)

---
 NEWS                        |  2 ++
 tools/display_driver_helper | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 6fced4a..3dec703 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- detect amdgpu (mga#20538)
+
 Version 1.20 - 9 March 2017
 
 - rely on libinput for synaptics (mga#20424)
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index d5488c0..c8b5461 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -30,9 +30,9 @@ fi
 
 export LC_ALL=C
 
-KMS_DRIVERS="i915 radeon nouveau"
+KMS_DRIVERS="i915 amdgpu radeon nouveau"
 # module names at run-time (hence nvidia instead of nvidia*):
-KNOWN_MODULES="i915|radeon|nouveau|fglrx|nvidia"
+KNOWN_MODULES="i915|amdgpu|radeon|nouveau|fglrx|nvidia"
 
 XORG_i915="intel"
 CONFLICTS_i915=""
@@ -41,7 +41,10 @@ XORG_nouveau="nouveau"
 CONFLICTS_nouveau="nv nvidia"
 
 XORG_radeon="ati radeon"
-CONFLICTS_radeon="fglrx"
+CONFLICTS_radeon="fglrx amdgpu"
+
+XORG_amdgpu="amdgpu"
+CONFLICTS_amdgpu="radeon"
 
 # Note: no /usr
 # See end of script for descriptions of global variables.
@@ -58,6 +61,13 @@ check_driver() {
 		check_xorg $name 0 || return 1
 		IS_KMS=1
 		;;
+	amdgpu)
+		# implicitely loaded by X.org
+		check_xorg $name 0 || return 1
+		IS_KMS=1
+		# amdgpu KMS needs to be loaded before X server
+		NEEDS_LOAD_NOW=1
+		;;
 	radeon)
 		# implicitely loaded by X.org
 		check_xorg $name 0 || return 1
-- 
cgit v1.2.1