summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2021-01-24 03:10:25 +0200
committerThomas Backlund <tmb@mageia.org>2021-01-24 03:10:25 +0200
commit625404cc5cef338ac4fa168a796cb3909612be3c (patch)
tree60a0331ee6b4723a1c13ed9d5ba401eda6bb5db8
parent594a8950dfb4dc0ba014622f98773a8af9535d85 (diff)
downloaddrakx-kbd-mouse-x11-625404cc5cef338ac4fa168a796cb3909612be3c.tar
drakx-kbd-mouse-x11-625404cc5cef338ac4fa168a796cb3909612be3c.tar.gz
drakx-kbd-mouse-x11-625404cc5cef338ac4fa168a796cb3909612be3c.tar.bz2
drakx-kbd-mouse-x11-625404cc5cef338ac4fa168a796cb3909612be3c.tar.xz
drakx-kbd-mouse-x11-625404cc5cef338ac4fa168a796cb3909612be3c.zip
add info for amdgpu vs radeon conflicts
-rw-r--r--NEWS1
-rw-r--r--tools/display_driver_helper4
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.