From 2e3f49939ed2e98b0ea3eaedbec41122966af260 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Dec 02 2009 03:58:17 +0000 Subject: - add R600 RLC firmware for IRQ handling --- diff --git a/.cvsignore b/.cvsignore index e6467c8..de64fb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xf86-video-ati-20090929.tar.xz +radeon-rlc-firmware-1.tar.bz2 diff --git a/sources b/sources index 1a57ee3..74efca2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f66ac154c99ba836f38f4bea302e9d75 xf86-video-ati-20091201.tar.xz +189be8ab60025bf81f8841ab53175665 radeon-rlc-firmware-1.tar.bz2 diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 7944d96..5b05adc 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -7,7 +7,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.13.0 -Release: 0.17.%{gitdate}git%{gitversion}%{?dist} +Release: 0.18.%{gitdate}git%{gitversion}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{tarball}-%{gitdate}.tar.xz # unlike the other drivers, radeon.xinf is generated Source1: mkxinf +Source2: radeon-rlc-firmware-1.tar.bz2 Patch2: radeon-ums-displayport.patch Patch6: radeon-6.9.0-bgnr-enable.patch @@ -43,8 +44,14 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2 %description X.Org X11 ati video driver. +%package firmware +Summary: ATI firmware for R600 RLC + +%description firmware +Firmware for ATI R600/R700 IRQs + %prep -%setup -q -n %{tarball}-%{gitdate} +%setup -q -n %{tarball}-%{gitdate} -a 2 %patch2 -p1 -b .dp %patch6 -p1 -b .bgnr %patch10 -p1 -b .lvds @@ -67,6 +74,9 @@ install -m 0644 radeon.xinf $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- +%{__mkdir_p} %{buildroot}/lib/firmware/radeon +%{__install} -p -m 0644 *.bin %{buildroot}/lib/firmware/radeon/ + %clean rm -rf $RPM_BUILD_ROOT @@ -81,7 +91,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/ati.4* %{_mandir}/man4/radeon.4* +%files firmware +%defattr(-,root,root,-) +%doc LICENSE.radeon.firmware +/lib/firmware/radeon/*.bin + %changelog +* Wed Dec 02 2009 Dave Airlie 6.13.0-0.18.20091201git88a50a30d +- add R600 RLC firmware for IRQ handling + * Wed Dec 02 2009 Dave Airlie 6.13.0-0.17.20091201git88a50a30d - ums displayport + bump libdrm requires for new function needed