Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28917/devel Modified Files: .cvsignore amdcccle.desktop fglrx-README.Fedora fglrx-config-display sources xorg-x11-drv-fglrx.spec Added Files: blacklist-radeon udev-fglrx Log Message: * Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1 - Update to Catalyst 9.1 - Include README.Fedora in %doc - Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs - Update License tag --- NEW FILE blacklist-radeon --- #blacklist required for proprietary fglrx driver blacklist radeon blacklist radeonfb blacklist drm --- NEW FILE udev-fglrx --- dri/card0 dri/card1 dri/card2 dri/card3 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Dec 2008 17:43:44 -0000 1.5 +++ .cvsignore 31 Jan 2009 06:25:45 -0000 1.6 @@ -1 +1 @@ -ati-driver-installer-8-12-x86.x86_64.run +ati-driver-installer-9-1-x86.x86_64.run Index: amdcccle.desktop =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/amdcccle.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amdcccle.desktop 16 Oct 2008 16:20:01 -0000 1.1 +++ amdcccle.desktop 31 Jan 2009 06:25:45 -0000 1.2 @@ -14,9 +14,8 @@ Comment[es]=Configuración del adaptador de los gráficos de ATI Comment[fr]=Configuration d'adapteur de graphiques d'ATI Comment[it]=Configurazione dell'adattatore dei grafici di ATI -Icon=ccc_large.xpm +Icon=ccc_large Exec=amdcccle Type=Application Terminal=false -Encoding=UTF-8 Categories=Qt;System; Index: fglrx-README.Fedora =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/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 31 Jan 2009 06:25:45 -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,41 @@ 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 +----------------------------- + +Recent releases (Catalyst 8.12+) are incompatible with the plymouth 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.rfbak + mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r` + +A final reboot will be required before things function as expected. To restore +plymouth functionality and use the open source drivers, first uninstall the +xorg-x11-drv-fglrx package from your system and then run: + mv /boot/initrd-`uname -r`.img.rfbak /boot/initrd-`uname -r`.img + +Once again, a reboot will be required before the open source drivers being +working properly. + -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 Index: fglrx-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/fglrx-config-display,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fglrx-config-display 16 Oct 2008 16:20:01 -0000 1.1 +++ fglrx-config-display 31 Jan 2009 06:25:45 -0000 1.2 @@ -55,9 +55,30 @@ # 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 + + # Annoying bit because newer fglrx drivers require a Screen section + if len(self.xconfig.layout) == 0: # no layouts + layout = xf86config.XF86ConfLayout() + self.xconfig.layout.insert(layout) + layout.identifier = "Default Layout" + else: + layout = self.xconfig.layout[0] + if len(layout.adjacencies) == 0: # no layout adjacencies + layout.adjacencies.insert(xf86config.XF86ConfAdjacency()) + layout.adjacencies[0].screen = "Screen0" + if len(self.xconfig.screen) == 0: # no screens + screen = xf86config.XF86ConfScreen() + self.xconfig.screen.insert(screen) + else: + screen = self.xconfig.screen[0] + screen.device = "Videocard0" + screen.defaultdepth = 24 + screen.identifier = "Screen0" + self.xconfig.device[0].identifier = 'Videocard0' + # fglrx modules self.addModulePath("/extensions/fglrx", self.TOP_MOD_DIR) # 'remembering' magic's in here. @@ -80,20 +101,13 @@ Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n") print _('Running ldconfig, this could take some time...') Utils.runLdconfig() - # 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) - # 20071023: AIGLX now supported by fglrx 8.42.3! - ## Disable AIGLX by default, it's not compatible - #self.setComposite(False) - #self.setAiglxFlag(False) 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 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2008 18:28:13 -0000 1.5 +++ sources 31 Jan 2009 06:25:45 -0000 1.6 @@ -1 +1 @@ -2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run +cc4ff401586a6c099c9fd002c25cf7bb ati-driver-installer-9-1-x86.x86_64.run Index: xorg-x11-drv-fglrx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/xorg-x11-drv-fglrx.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-drv-fglrx.spec 10 Dec 2008 18:28:13 -0000 1.10 +++ xorg-x11-drv-fglrx.spec 31 Jan 2009 06:25:45 -0000 1.11 @@ -1,5 +1,5 @@ %define atilibdir %{_libdir}/fglrx -%define ativersion 8.12 +%define ativersion 9.1 # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -8,13 +8,13 @@ %endif Name: xorg-x11-drv-fglrx -Version: 8.561 +Version: 8.573 Release: 1.%{ativersion}%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support -License: BSD/Commercial/GPL/QPL +License: Redistributable, no modification permitted URL: http://www.ati.com/support/drivers/linux/radeon-linux.html -Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri... +Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri... Source1: fglrx-README.Fedora Source3: fglrx-config-display Source4: fglrx-init @@ -25,6 +25,8 @@ Source9: fglrx-a-lid-aticonfig Source10: fglrx.sh Source11: fglrx.csh +Source12: udev-fglrx +Source13: blacklist-radeon BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,8 +62,8 @@ Conflicts: kernel-module-ATI-fglrx Conflicts: ATI-fglrx-IA32-libs -Obsoletes: ati-x11-drv < %{version}-%{release} -Provides: ati-x11-drv = %{version}-%{release} +Obsoletes: ati-x11-drv < %{version}-%{release} +Provides: ati-x11-drv = %{version}-%{release} %description This package provides the most recent proprietary AMD display driver which @@ -117,12 +119,12 @@ %endif %ifarch x86_64 -echo `pwd` cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/ %endif -# fix doc perms +# fix doc perms & copy README.Fedora find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \; +install -pm 0644 %{SOURCE1} ./README.Fedora %build @@ -212,8 +214,7 @@ install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor livna \ - --add-category X-Livna \ +desktop-file-install --vendor rpmfusion \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE5} @@ -228,6 +229,14 @@ chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh +# 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 + %clean rm -rf $RPM_BUILD_ROOT @@ -259,7 +268,8 @@ %files %defattr(-,root,root,-) -%doc fglrxpkg/usr/share/doc/fglrx/* +%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora +%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes %dir %{_sysconfdir}/ati/ %{_sysconfdir}/ati/authatieventsd.sh %{_sysconfdir}/ati/signature @@ -270,7 +280,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}/* @@ -289,7 +300,6 @@ %defattr(-,root,root,-) %dir %{atilibdir} %{atilibdir}/*.so* -# FIXME: This file is recognized as "data" - figure out how to move it later %{atilibdir}/libAMDXvBA.cap %{_libdir}/dri/ @@ -302,6 +312,13 @@ %{_includedir}/X11/extensions/*.h %changelog +* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1 +- Update to Catalst 9.1 +- Sync with changes made for F-10 +- Include README.Fedora in %%doc +- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs +- Update License tag + * Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12 - Update to 8.12 - Add Conflicts: for new nvidia packages