summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--tools/display_driver_helper4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 3a03c67..c923d90 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- display_driver_helper: fix --is-kms-allowed for amdgpu (mga#24589)
+
Version 1.26 - 16 March 2019
- add 'xclone' boot option to control Xorg default configuration (mga#24469)
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index c8b5461..4e89229 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 amdgpu"
+CONFLICTS_radeon="fglrx"
XORG_amdgpu="amdgpu"
-CONFLICTS_amdgpu="radeon"
+CONFLICTS_amdgpu=""
# Note: no /usr
# See end of script for descriptions of global variables.