x11-libs/libdrm_nouveau: update for new libdrm-2.4.9 in portage

svn path=/sunrise/; revision=8516

8 files changed, 130 insertions, 29 deletions

diff --git a/x11-libs/libdrm_nouveau/ChangeLog b/x11-libs/libdrm_nouveau/ChangeLog
index 89980bda0..2fc72181f 100644
--- a/x11-libs/libdrm_nouveau/ChangeLog
+++ b/x11-libs/libdrm_nouveau/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 May 2009; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de>
+  +files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patc
+  h, -libdrm_nouveau-2.4.6.ebuild, -files/libdrm-2.4.6-makefile.patch,
+  +libdrm_nouveau-2.4.9.ebuild,
+  +files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch,
+  +files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch,
+  +files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
+  :
+  update for new libdrm-2.4.9 in portage
+
   10 Apr 2009; Chi-Thanh Christopher Nguyen (chithead)
   <chithanh@cs.tu-berlin.de> -libdrm_nouveau-2.4.5.ebuild,
   -files/libdrm-2.4.5-nouveau.patch, +libdrm_nouveau-2.4.6.ebuild,
diff --git a/x11-libs/libdrm_nouveau/Manifest b/x11-libs/libdrm_nouveau/Manifest
index 061bd75dd..8746ba876 100644
--- a/x11-libs/libdrm_nouveau/Manifest
+++ b/x11-libs/libdrm_nouveau/Manifest
@@ -1,5 +1,8 @@
-AUX libdrm-2.4.6-makefile.patch 557 RMD160 9e82191fac3080927748832072c4e6aa2c5859e6 SHA1 74c2c97019b3f36f6eecef017b21ac96d6d73014 SHA256 4a9c7411f7b544e87bbef9f621536b9ab9409306c0862e30bbf411443df30654
-DIST libdrm-2.4.6.tar.gz 516193 RMD160 99c4b4cb060ae2f225f39a9f73b62145f97832be SHA1 ec4b7d23566ce1cfd05fd33d8aad6f88d7c3d37b SHA256 8f7a959900027a8235f345cb61a4cf0f0095683519c45af8dccbe39446414895
-EBUILD libdrm_nouveau-2.4.6.ebuild 1337 RMD160 a7758a26beaa3310c5fdba04ff51fca9a36830d1 SHA1 c0c823839e72717f2edf47cf2266d23048d8d3ed SHA256 654fec1867d8ed19b65ba1a4709f61f4ecae9eb348dc4eb0497528d4e6e3528b
-MISC ChangeLog 554 RMD160 a1c69a28e9b4d35e06b7b8eb2927bc2fa000eee3 SHA1 400e08bb65231e7dadbe6b89f84f382febc06e05 SHA256 2af0e9af86b310066c611edb240c875501542119cd51d13d39620d31bf5b220e
+AUX 2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch 711 RMD160 6942f00eb8e45868fdcb1f52f2583cacf3806a0d SHA1 1c889f475e7e1ee6a03dabdf66088b787c0a0ceb SHA256 adb1d9052789290078315e14e7cd3e4a202f649bf8ad37181bc67caf38520849
+AUX 2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch 708 RMD160 795b4dbf84914bbc13c5db086769d0b500385441 SHA1 187780606e0100c8d2de251af4af8cb773955180 SHA256 cfc0325d305c5d534a0c564d90f63f2ff27a45968203453defd531d38d853c3e
+AUX 2.4.9-0003-libdrm-mode-align-subpixel-results.patch 901 RMD160 1a66e30396a1c6a04d8e398dabe7f42c975e8327 SHA1 12eb648b7f41de9e5ce4f2a3dcec32d1d93e07a6 SHA256 567f496c402ee78ad99d4a95e2ee297208ea4593d1be2040eaf368edc6a2d7ba
+AUX 2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch 1048 RMD160 358d8dfdc8b6ea36bffe476151a24467d96fc5eb SHA1 55bd0fb8342e5be26ee4498242670f13535ed2a7 SHA256 12cf1766699dd02c0df7558972ac67026742b0d016c749c3f5b0c5eba85e5dce
+DIST libdrm-2.4.9.tar.gz 523793 RMD160 2d988da67c343dc480a46ea4370dbe0067c47212 SHA1 ca40ef9fe1cfbfd2538631d449a68bf5247bc285 SHA256 c74b2e188398978c6a358d7c0fa2c8db7ac13c548b32c297f14c2cc2550cb2dd
+EBUILD libdrm_nouveau-2.4.9.ebuild 1602 RMD160 b567618b6ff3e9ee31d6032d1732b2fd132eca0b SHA1 e954e5bbb16126b2ec27265322f56b6594d9b2fe SHA256 98501e151b1f528298e5f8fb54b6843c4b0273a5ca7c978541267192ab42b08b
+MISC ChangeLog 1080 RMD160 3f04fd47b101fa5398d7a2c28a6f0de5ee3fd3e7 SHA1 2f5d44bfe6139c59e0d4440643cc684b64f89891 SHA256 e231655ba5cfad05e791e2b54841078546d0d55a3f8221eaa284e6b1282da862
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-libs/libdrm_nouveau/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch b/x11-libs/libdrm_nouveau/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
new file mode 100644
index 000000000..a667eaed2
--- /dev/null
+++ b/x11-libs/libdrm_nouveau/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
@@ -0,0 +1,26 @@
+From 78e753d03314e3aa92af8ec601e9dbb869a938d5 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed, 15 Apr 2009 12:44:21 +1000
+Subject: [PATCH 1/4] nouveau: store bo handle in public struct in bo_ref_handle
+
+---
+ libdrm/nouveau/nouveau_bo.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 023c6be..66466e3 100644
+--- a/libdrm/nouveau/nouveau_bo.c
++++ b/libdrm/nouveau/nouveau_bo.c
+@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
+ 		nvbo->size = req.size;
+ 		nvbo->handle = req.handle;
+ 	}
+- 
++
++	nvbo->base.handle = nvbo->handle;
+ 	return 0;
+ } 
+ 
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm_nouveau/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch b/x11-libs/libdrm_nouveau/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
new file mode 100644
index 000000000..fc3c7c207
--- /dev/null
+++ b/x11-libs/libdrm_nouveau/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
@@ -0,0 +1,24 @@
+From a1e3ab9e55047c08a4006ec389c1a99b72bc672c Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Fri, 17 Apr 2009 09:29:19 +1000
+Subject: [PATCH 2/4] nouveau: write posting got lost somewhere, bring it back
+
+---
+ libdrm/nouveau/nouveau_dma.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
+index 23da64b..b084f70 100644
+--- a/libdrm/nouveau/nouveau_dma.c
++++ b/libdrm/nouveau/nouveau_dma.c
+@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
+ 	volatile int dum;
+ 
+ 	NOUVEAU_DMA_BARRIER;
++	dum = nvchan->pushbuf[0];
+ 	dum = READ_GET(nvchan);
+ 
+ 	*nvchan->put = put;
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm_nouveau/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch b/x11-libs/libdrm_nouveau/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch
new file mode 100644
index 000000000..0fa468c63
--- /dev/null
+++ b/x11-libs/libdrm_nouveau/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch
@@ -0,0 +1,26 @@
+From 412d370b9ae4b2882691863a1c5e13a507574e92 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Wed, 22 Apr 2009 20:25:40 +1000
+Subject: [PATCH 3/4] libdrm/mode: align subpixel results
+
+---
+ libdrm/xf86drmMode.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
+index 872604f..ea11207 100644
+--- a/libdrm/xf86drmMode.c
++++ b/libdrm/xf86drmMode.c
+@@ -395,7 +395,8 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
+ 	r->connection   = conn.connection;
+ 	r->mmWidth      = conn.mm_width;
+ 	r->mmHeight     = conn.mm_height;
+-	r->subpixel     = conn.subpixel;
++	/* convert subpixel from kernel to userspace */
++	r->subpixel     = conn.subpixel + 1;
+ 	r->count_modes  = conn.count_modes;
+ 	/* TODO we should test if these alloc & cpy fails. */
+ 	r->count_props  = conn.count_props;
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm_nouveau/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch b/x11-libs/libdrm_nouveau/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
new file mode 100644
index 000000000..6a5a9a314
--- /dev/null
+++ b/x11-libs/libdrm_nouveau/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
@@ -0,0 +1,28 @@
+From 11b60973bca1bc9bbda44be4c695e22d28d8ca4a Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Tue, 21 Apr 2009 17:13:16 -0700
+Subject: [PATCH 4/4] intel: NULL fake bo block when freeing in evict_all
+
+Fixes assertion failures on later use of the object.
+---
+ libdrm/intel/intel_bufmgr_fake.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libdrm/intel/intel_bufmgr_fake.c b/libdrm/intel/intel_bufmgr_fake.c
+index e1f98d6..969c03d 100644
+--- a/libdrm/intel/intel_bufmgr_fake.c
++++ b/libdrm/intel/intel_bufmgr_fake.c
+@@ -1467,8 +1467,10 @@ drm_intel_bufmgr_fake_evict_all(drm_intel_bufmgr *bufmgr)
+    assert(DRMLISTEMPTY(&bufmgr_fake->on_hardware));
+ 
+    DRMLISTFOREACHSAFE(block, tmp, &bufmgr_fake->lru) {
++      drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *)block->bo;
+       /* Releases the memory, and memcpys dirty contents out if necessary. */
+       free_block(bufmgr_fake, block, 0);
++      bo_fake->block = NULL;
+    }
+ 
+    pthread_mutex_unlock(&bufmgr_fake->lock);
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm_nouveau/files/libdrm-2.4.6-makefile.patch b/x11-libs/libdrm_nouveau/files/libdrm-2.4.6-makefile.patch
deleted file mode 100644
index 61bee916c..000000000
--- a/x11-libs/libdrm_nouveau/files/libdrm-2.4.6-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1faab66cfd1a854925da6ff7109aa614292dea90 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@linux.ie>
-Date: Mon, 06 Apr 2009 23:26:32 +0000
-Subject: drm: fix test makefile
-
-no idea if this is correct but it works so meh
----
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bc99447..e5e9fc4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -2,6 +2,8 @@ AM_CFLAGS = \
- 	-I $(top_srcdir)/shared-core \
- 	-I $(top_srcdir)/libdrm
- 
-+AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
-+
- noinst_PROGRAMS = \
- 	dristat \
- 	drmstat
---
-cgit v0.8.2
diff --git a/x11-libs/libdrm_nouveau/libdrm_nouveau-2.4.6.ebuild b/x11-libs/libdrm_nouveau/libdrm_nouveau-2.4.9.ebuild
index 171d5622b..c94892a85 100644
--- a/x11-libs/libdrm_nouveau/libdrm_nouveau-2.4.6.ebuild
+++ b/x11-libs/libdrm_nouveau/libdrm_nouveau-2.4.9.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 
 # Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
+#SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -26,8 +26,13 @@ RDEPEND="dev-libs/libpthread-stubs
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${DRM_P}"
-PATCHES=( "${FILESDIR}/${DRM_P}-makefile.patch" )
-CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
+	"${FILESDIR}"/${PV}-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
+	"${FILESDIR}"/${PV}-0003-libdrm-mode-align-subpixel-results.patch
+	"${FILESDIR}"/${PV}-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
+)
+CONFIGURE_OPTIONS="--enable-nouveau-experimental-api"
 
 # FIXME, we should try to see how we can fit the --enable-udev configure flag