From 625404cc5cef338ac4fa168a796cb3909612be3c Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 24 Jan 2021 03:10:25 +0200
Subject: add info for amdgpu vs radeon conflicts

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

diff --git a/NEWS b/NEWS
index c85595e..dcf0bac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- add info for amdgpu vs radeon conflicts
 - translation updates
 
 Version 1.31 - 04 January 2021
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 4e89229..b5ba56c 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -41,10 +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=""
+CONFLICTS_amdgpu="ati radeon"
 
 # Note: no /usr
 # See end of script for descriptions of global variables.
-- 
cgit v1.2.1