[arch-commits] Commit in nouveau-drm/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Sep 30 21:16:27 UTC 2009


    Date: Wednesday, September 30, 2009 @ 17:16:27
  Author: andyrtr
Revision: 53417

Merged revisions 53415 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/nouveau-drm/trunk

........
  r53415 | andyrtr | 2009-09-30 21:13:12 +0000 (Mi, 30 Sep 2009) | 2 lines
  
  upgpkg: nouveau-drm 0.0.15_20090920-2
      add a patch to fix module loading causing memory issues and crashes
........

Added:
  nouveau-drm/repos/testing-i686/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch
    (from rev 53415, nouveau-drm/trunk/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch)
Modified:
  nouveau-drm/repos/testing-i686/	(properties)
  nouveau-drm/repos/testing-i686/PKGBUILD

----------------------------------------------------------------+
 0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch |   25 ++++++++++
 PKGBUILD                                                       |   12 +++-
 2 files changed, 33 insertions(+), 4 deletions(-)


Property changes on: nouveau-drm/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nouveau-drm/trunk:1-52554
   + /nouveau-drm/trunk:1-53416

Copied: nouveau-drm/repos/testing-i686/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch (from rev 53415, nouveau-drm/trunk/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch)
===================================================================
--- testing-i686/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch	                        (rev 0)
+++ testing-i686/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch	2009-09-30 21:16:27 UTC (rev 53417)
@@ -0,0 +1,25 @@
+From 11f193fa874dc995a499601aa32b33938dc7fbeb Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin at 0x04.net>
+Date: Tue, 29 Sep 2009 23:50:16 +0200
+Subject: [PATCH] drm/nouveau: fix missized allocation for ttm_bo_global struct
+
+---
+ drivers/gpu/drm/nouveau/nouveau_ttm.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
+index 352f04d..7818981 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
++++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
+@@ -103,7 +103,7 @@ nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
+ 	dev_priv->ttm.bo_global_ref.mem_glob = global_ref->object;
+ 	global_ref = &dev_priv->ttm.bo_global_ref.ref;
+ 	global_ref->global_type = TTM_GLOBAL_TTM_BO;
+-	global_ref->size = sizeof(struct ttm_mem_global);
++	global_ref->size = sizeof(struct ttm_bo_global);
+ 	global_ref->init = &ttm_bo_global_init;
+ 	global_ref->release = &ttm_bo_global_release;
+ 
+-- 
+1.6.0.4
+

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-09-30 21:14:00 UTC (rev 53416)
+++ testing-i686/PKGBUILD	2009-09-30 21:16:27 UTC (rev 53417)
@@ -6,7 +6,7 @@
 _snapdate=20090920
 pkgver=0.0.15_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
 _kernver='2.6.31-ARCH'
-pkgrel=1
+pkgrel=2
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -18,10 +18,16 @@
 source=(ftp://ftp.archlinux.org/other/$pkgname/master-${_snapdate}.tar.gz 
 	#http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz
 	# get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat
-	Makefile)
+	Makefile
+	0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch)
+md5sums=('1eaa4874e4e1ba31d29f56046c6d5f52'
+         '84e2fdf54c027372fbce6c0d81127c24'
+         '0cb580eb4e2007982675a9eb1009f864')
 
 build() {
   cd ${srcdir}/master
+  patch -Np1 -i $srcdir/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch || return 1
+  
   mkdir nouveau
   cp $srcdir/Makefile ${srcdir}/master/nouveau/
   cd nouveau
@@ -37,5 +43,3 @@
   # install script
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/${pkgname}.install
 }
-md5sums=('1eaa4874e4e1ba31d29f56046c6d5f52'
-         '84e2fdf54c027372fbce6c0d81127c24')




More information about the arch-commits mailing list