[paketler-commits] r54947 - in 2008/kernel/drivers/ati-drivers: . comar

[paketler-commits at pardus.org.tr]

Author: eki
Date: Fri Oct 24 16:34:21 2008
New Revision: 54947

Modified:
   2008/kernel/drivers/ati-drivers/comar/xorg.driver.py
   2008/kernel/drivers/ati-drivers/pspec.xml
Log:
merge : Added a workaround for hard-lockups on some hardware.

Modified: 2008/kernel/drivers/ati-drivers/comar/xorg.driver.py
=================================================================
--- 2008/kernel/drivers/ati-drivers/comar/xorg.driver.py	(original)
+++ 2008/kernel/drivers/ati-drivers/comar/xorg.driver.py	Fri Oct 24 16:34:21 2008
@@ -32,9 +32,6 @@
     file("/var/lib/zorg/enabled_package", "w").write("ati-drivers")
     file("/var/lib/zorg/kernel_module", "w").write("fglrx")
 
-    subprocess.call(["/sbin/rmmod", "-s", "fglrx", "radeon"])
-    subprocess.call(["/sbin/modprobe", "-s", "fglrx"])
-
 def disable():
     symlink("/usr/lib/xorg/std/lib/libGL.so.1.2",       "/usr/lib/libGL.so.1.2")
     symlink("/usr/lib/xorg/std/extensions/libdri.so",   "/usr/lib/xorg/modules/extensions/libdri.so")
@@ -47,7 +44,12 @@
 def probe(device):
     device["depth"] = "24"
 
+    # Workaround for hard-lockups on some hardware.
+    # Module unloading and reloading moved here from enable()
+    # since probing with kernel module causes problems.
+    subprocess.call(["/sbin/rmmod", "-s", "fglrx", "radeon"])
     lines = zorg.probe.XProbe(device)
+    subprocess.call(["/sbin/modprobe", "-s", "fglrx"])
     if not lines:
         return
 

Modified: 2008/kernel/drivers/ati-drivers/pspec.xml
=================================================================
--- 2008/kernel/drivers/ati-drivers/pspec.xml	(original)
+++ 2008/kernel/drivers/ati-drivers/pspec.xml	Fri Oct 24 16:34:21 2008
@@ -71,6 +71,13 @@
     </Package>
 
     <History>
+        <Update release="42">
+            <Date>2008-10-23</Date>
+            <Version>8.10</Version>
+            <Comment>Ensure the kernel module is unloaded while probing as a workaround for some hard-lockups</Comment>
+            <Name>Fatih Aşıcı</Name>
+            <Email>fatih at pardus.org.tr</Email>
+        </Update>
         <Update release="41">
             <Date>2008-10-16</Date>
             <Version>8.10</Version>