rpms/xorg-x11-drv-fglrx/F-10 blacklist-radeon, NONE,
1.1 fglrx-README.Fedora, 1.1, 1.2 fglrx-config-display, 1.2,
1.3 xorg-x11-drv-fglrx.spec, 1.12, 1.13
Stewart Adam
firewing at rpmfusion.org
Tue Dec 30 23:41:35 CET 2008
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23030/F-10
Modified Files:
fglrx-README.Fedora fglrx-config-display
xorg-x11-drv-fglrx.spec
Added Files:
blacklist-radeon
Log Message:
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Move fglrx_dri.so to monolib package
- Static blacklist required for <R600 hardware, add it back
- Make fglrx-config-display check the ldfile to see if it's already enabled
--- NEW FILE blacklist-radeon ---
#blacklist required for proprietary fglrx driver
blacklist radeon
blacklist radeonfb
blacklist drm
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-README.Fedora 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-README.Fedora 30 Dec 2008 22:41:04 -0000 1.2
@@ -1,7 +1,8 @@
-README for AMD's Linux fglrx drivers, as packaged by livna.org.
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
1. After Installation
----------------------
+-----------------------------
The easiest way to start using the fglrx drivers after installation is to
restart your system.
@@ -44,8 +45,9 @@
fglrx-config-display disable
Note: DRI will be disabled in this case when the fglrx kernel-module was
loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers, run:
- fglrx-config-display enable
+To re-enable the fglrx drivers without a reboot, run:
+ fglrx-config-display enable
+
3. Additional configuration
@@ -54,14 +56,33 @@
For configuration options (TwinView, TV-out etc) see
/usr/share/doc/fglrx-*/index.html
+
4. Kernel Module
-----------------------
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+ kmod-fglrx-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+ (e.g. kmod-fglrx-2.6.27.7-134.fc10.x86_64-8.561-1.8.12.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+ (e.g fglrx-kmod-8.561-2.8.12.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+ rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
+
+
+5. Release-specific notes
+-----------------------------
+
+This release (Catalyst 8.12) is incompatible with the plymouth graphical boot
+system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules are
+loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of
+this, these modules have been blacklisted. The open-source radeon driver as well
+as the plymouth graphical boot system will not function while the this driver is
+installed. If you would like to use them, please uninstall this driver first.
+
+The initrd image for the current kernel will need to be regenerated before 3D
+rendering will function correctly. To do this, execute these commands as root:
+ mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.bak
+ mkinitrd -f --allow-missing /boot/`uname -r`.img
-The fglrx kernel module is required for DRI. For Fedora kernels you will
-find RPMs with the name:
- kmod-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
- (e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
-at rpm.livna.org. If you use another kernel grab the proper SRPM
- (e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
-from rpm.livna.org and rebuild the kernel module with the following command:
- rpmbuild --rebuild /path/to/fglrxRPM.src.rpm
+A final reboot will be required before things function as expected.
Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-config-display,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-config-display 26 Dec 2008 03:39:46 -0000 1.2
+++ fglrx-config-display 30 Dec 2008 22:41:04 -0000 1.3
@@ -55,7 +55,7 @@
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
- if currentDriver == self.majorVendor:
+ if os.path.exists(self.ldconf):
print _('Driver already enabled.')
return
@@ -101,20 +101,13 @@
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- # Requires for F10
- blacklistContent = "#blacklist required for proprietary fglrx driver\nblacklist radeon\nblacklist radeonfb\nblacklist drm\n"
- Utils.writeFile('/etc/modprobe.d/blacklist-radeon', blacklistContent)
- print _('Please reboot to finish driver configuration.')
- # Haven't heard of this in a while either.
- #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
- # print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
self.restoreconf()
def disable(self, isAutoConfigure=True):
self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# Check if it's already disabled
- if self.getDriver() != self.majorVendor:
+ if not os.path.exists(self.ldconf):
print _('Driver already disabled.')
return
# We have to save the status file so it can be restored later
@@ -133,7 +126,6 @@
Utils.removeFile(self.ldconf)
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- Utils.removeFile('/etc/modprobe.d/blacklist-radeon')
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# And return to the Fedora default.
self.enableAiglx()
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-fglrx.spec 26 Dec 2008 03:41:58 -0000 1.12
+++ xorg-x11-drv-fglrx.spec 30 Dec 2008 22:41:04 -0000 1.13
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 3.%{ativersion}%{?dist}
+Release: 4.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -26,6 +26,7 @@
Source10: fglrx.sh
Source11: fglrx.csh
Source12: udev-fglrx
+Source13: blacklist-radeon
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -229,10 +230,18 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
-#Udev dri nodes for fglrx
+# blacklist to prevent radeon autoloading
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-radeon
+
+# Udev dri nodes for fglrx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+# dri workaround
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
+ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -276,7 +285,8 @@
%config %{_sysconfdir}/ati/control
%config %{_sysconfdir}/ati/amdpcsdb.default
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-radeon
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
@@ -290,6 +300,10 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
+%{_libdir}/dri/
+%ifarch x86_64
+%{_prefix}/lib/dri/
+%endif
%files libs
%defattr(-,root,root,-)
@@ -297,7 +311,6 @@
%{atilibdir}/*.so*
# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
-%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -308,6 +321,11 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
+- Move fglrx_dri.so to monolib package
+- Static blacklist required for <R600 hardware, add it back
+- Make fglrx-config-display check the ldfile to see if it's already enabled
+
* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
- Remove blacklist, generate via fglrx-config-display instead
- Add extra bits to create Screen section in xorg.conf
More information about the rpmfusion-commits
mailing list