rpms/xorg-x11-drv-ati/F-12 radeon-revert-api.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 sources, 1.37, 1.38 xorg-x11-drv-ati.spec, 1.199, 1.200 radeon-dri2-revert-drm-func.patch, 1.1, NONE
Dave Airlie
airlied at fedoraproject.org
Mon Dec 21 06:05:49 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18734a
Modified Files:
.cvsignore sources xorg-x11-drv-ati.spec
Added Files:
radeon-revert-api.patch
Removed Files:
radeon-dri2-revert-drm-func.patch
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.19.20091221git4b05c47ac
- rebase to upstream master - revert API changes for F12 for now.
radeon-revert-api.patch:
r600_exa.c | 9 ++++++---
radeon_exa.c | 3 +--
radeon_exa_funcs.c | 10 ++++++----
3 files changed, 13 insertions(+), 9 deletions(-)
--- NEW FILE radeon-revert-api.patch ---
>From a4a72f0b8b18ee70c9103088c646ead7b61f745d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 21 Dec 2009 16:00:48 +1000
Subject: [PATCH] revert api
---
src/r600_exa.c | 9 ++++++---
src/radeon_exa.c | 3 +--
src/radeon_exa_funcs.c | 9 ++++++---
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 6a132bb..634e6ca 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2027,7 +2027,7 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
driver_priv = exaGetPixmapDriverPrivate(pDst);
/* If we know the BO won't be busy, don't bother */
- if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs) &&
+ if (driver_priv->bo->cref == 1 &&
!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
return FALSE;
@@ -2097,8 +2097,11 @@ R600DownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
driver_priv = exaGetPixmapDriverPrivate(pSrc);
/* If we know the BO won't end up in VRAM anyway, don't bother */
- if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
- src_domain = radeon_bo_get_src_domain(driver_priv->bo);
+ if (driver_priv->bo->cref > 1) {
+ src_domain = driver_priv->bo->space_accounted & 0xffff;
+ if (!src_domain)
+ src_domain = driver_priv->bo->space_accounted >> 16;
+
if ((src_domain & (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM)) ==
(RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM))
src_domain = 0;
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 97733c3..bff6ec0 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -341,7 +341,6 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
{
ScreenPtr pScreen = pPix->drawable.pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- RADEONInfoPtr info = RADEONPTR(pScrn);
struct radeon_exa_pixmap_priv *driver_priv;
int ret;
@@ -357,7 +356,7 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
return FALSE;
/* if we have more refs than just the BO then flush */
- if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs))
+ if (driver_priv->bo->cref > 1)
radeon_cs_flush_indirect(pScrn);
/* flush IB */
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 6d2522a..61c7427 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -484,7 +484,7 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
#endif
/* If we know the BO won't be busy, don't bother */
- if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs) &&
+ if (driver_priv->bo->cref == 1 &&
!radeon_bo_is_busy(driver_priv->bo, &dst_domain)) {
#if X_BYTE_ORDER == X_BIG_ENDIAN
/* Can't return FALSE here if we need to swap bytes */
@@ -582,8 +582,11 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
#endif
/* If we know the BO won't end up in VRAM anyway, don't bother */
- if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
- src_domain = radeon_bo_get_src_domain(driver_priv->bo);
+ if (driver_priv->bo->cref > 1) {
+ src_domain = driver_priv->bo->space_accounted & 0xffff;
+ if (!src_domain)
+ src_domain = driver_priv->bo->space_accounted >> 16;
+
if ((src_domain & (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM)) ==
(RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM))
src_domain = 0;
--
1.6.5.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore 2 Dec 2009 02:50:08 -0000 1.37
+++ .cvsignore 21 Dec 2009 06:05:48 -0000 1.38
@@ -1 +1,2 @@
-xf86-video-ati-20091201.tar.xz
+radeon-rlc-firmware-1.tar.bz2
+xf86-video-ati-20091221.tar.xz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources 2 Dec 2009 02:50:08 -0000 1.37
+++ sources 21 Dec 2009 06:05:49 -0000 1.38
@@ -1 +1,2 @@
-f66ac154c99ba836f38f4bea302e9d75 xf86-video-ati-20091201.tar.xz
+189be8ab60025bf81f8841ab53175665 radeon-rlc-firmware-1.tar.bz2
+84236a984ca7d78c7a33655e54c26e4c xf86-video-ati-20091221.tar.xz
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/xorg-x11-drv-ati.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- xorg-x11-drv-ati.spec 2 Dec 2009 02:50:08 -0000 1.199
+++ xorg-x11-drv-ati.spec 21 Dec 2009 06:05:49 -0000 1.200
@@ -1,13 +1,13 @@
%define tarball xf86-video-ati
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define gitdate 20091201
-%define gitversion 88a50a30d
+%define gitdate 20091221
+%define gitversion 4b05c47ac
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.13.0
-Release: 0.16.%{gitdate}git%{gitversion}%{?dist}
+Release: 0.19.%{gitdate}git%{gitversion}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -17,8 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
Source0: %{tarball}-%{gitdate}.tar.xz
# unlike the other drivers, radeon.xinf is generated
Source1: mkxinf
+Source2: radeon-rlc-firmware-1.tar.bz2
-Patch1: radeon-dri2-revert-drm-func.patch
+Patch1: radeon-revert-api.patch
Patch6: radeon-6.9.0-bgnr-enable.patch
Patch10: radeon-6.12.2-lvds-default-modes.patch
Patch13: fix-default-modes.patch
@@ -28,14 +29,14 @@ ExcludeArch: s390 s390x
BuildRequires: python
BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.4.0-0.21
+BuildRequires: libdrm-devel >= 2.4.15-6
BuildRequires: kernel-headers >= 2.6.27-0.308
BuildRequires: automake autoconf libtool pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.1.5
Requires: hwdata
Requires: xorg-x11-server-Xorg >= 1.4.99.1
-Requires: libdrm >= 2.4.0-0.21
+Requires: libdrm >= 2.4.15-6
# new CS method needs newer kernel
Requires: kernel >= 2.6.29.1-111.fc11
Obsoletes: xorg-x11-drv-avivo <= 0.0.2
@@ -43,9 +44,15 @@ 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}
-%patch1 -p1 -b .revert
+%setup -q -n %{tarball}-%{gitdate} -a 2
+%patch1 -p1 -b .revert-api
%patch6 -p1 -b .bgnr
%patch10 -p1 -b .lvds
%patch13 -p1 -b .def
@@ -67,6 +74,9 @@ install -m 0644 radeon.xinf $RPM_BUILD_R
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,21 @@ 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
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.19.20091221git4b05c47ac
+- rebase to upstream master - revert API changes for F12 for now.
+
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
+- add R600 RLC firmware for IRQ handling
+
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
+- ums displayport + bump libdrm requires for new function needed
+
* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.16.20091201git88a50a30d
- fixed up multi-op support for r600s
--- radeon-dri2-revert-drm-func.patch DELETED ---
More information about the fedora-extras-commits
mailing list