From af5c57c46ffa8617713b9bca29dea32985743d8e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Feb 19 2010 00:44:47 +0000 Subject: - rebase to latest upstream - fixes r600 hangs --- diff --git a/.cvsignore b/.cvsignore index 31e4458..baa3253 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ radeon-rlc-firmware-1.tar.bz2 xf86-video-ati-20091221.tar.xz xf86-video-ati-20100125.tar.xz xf86-video-ati-20100208.tar.xz +xf86-video-ati-20100219.tar.xz diff --git a/sources b/sources index b3f8ea0..a4363d0 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 189be8ab60025bf81f8841ab53175665 radeon-rlc-firmware-1.tar.bz2 -8f52f5f8fa88f3e5b6db9fc744b82502 xf86-video-ati-20100125.tar.xz -913c0d76c60487dd242b996eec703b8e xf86-video-ati-20100208.tar.xz +ac46b84ced4b120d53da8d9f71d83513 xf86-video-ati-20100219.tar.xz diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 1f20136..2c1ac74 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -1,13 +1,13 @@ %define tarball xf86-video-ati %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20100208 -%define gitversion 4f9d1714a +%define gitdate 20100219 +%define gitversion e68d3a389 Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.13.0 -Release: 0.22.%{gitdate}git%{gitversion}%{?dist} +Release: 0.23.%{gitdate}git%{gitversion}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Fri Feb 19 2010 Dave Airlie 6.13.0-0.23.20100219gite68d3a389 +- rebase to latest upstream - fixes r600 hangs + * Wed Feb 10 2010 Dave Airlie 6.13.0-0.22.20100208git4f9d1714a - drop firmware now in linux-firmware