From e74c160a2fbab366c8caac0af98244b6501dd19c Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 21 Sep 2007 11:28:31 +0000
Subject: unload drivers loaded by monitor-probe-using-X (fix fglrx usage when
 harddrake probes using X and loads radeon driver)

---
 NEWS                   | 3 +++
 lib/Xconfig/monitor.pm | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e57b3e7..02f8959 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- unload drivers loaded by monitor-probe-using-X
+  (fix fglrx usage when harddrake probes using X and loads radeon driver)
+
 Version 0.28 - 20 September 2007, by Pascal "Pixel" Rigaux
 
 - when using evdev for mice, ensure it doesn't match a keyboard
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 6d1e851..a05d5ee 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -257,8 +257,12 @@ sub probe_using_X {
 	$cards[0]{Driver};
     } or return;
 
-    my $resolution = run_program::rooted_get_stdout($::prefix, 'monitor-probe-using-X', $card_Driver) or return;
-    generic_flat_panel(chomp_($resolution));
+    require modules;
+    my @old_modules = modules::loaded_modules();
+    my $resolution = run_program::rooted_get_stdout($::prefix, 'monitor-probe-using-X', $card_Driver);
+    modules::unload(difference2([ modules::loaded_modules() ], \@old_modules));
+
+    $resolution && generic_flat_panel(chomp_($resolution));
 }
 
 sub probe_DMI() {
-- 
cgit v1.2.1