summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-09-24 14:25:30 +0200
committerJulien Cristau <jcristau@debian.org>2008-09-24 14:25:30 +0200
commit872cb1a0dd16304cc5a0cecc642cc6c6d3781d44 (patch)
treea5a8033602b39d26da9852018a3d15935e27f387
parentee80a3a623bc9d0f9ea01a3c1e03204300f44097 (diff)
intel: don't warn about TTM init failure.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/01_disable-intel-classic-warn.diff14
-rw-r--r--debian/patches/series1
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ea1bf797a1f..cb8c9f54b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mesa (7.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove the build-dep on dri2proto, DRI2 support has been removed.
+ * intel: don't warn about TTM init failure.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 23 Sep 2008 16:08:48 +0300
diff --git a/debian/patches/01_disable-intel-classic-warn.diff b/debian/patches/01_disable-intel-classic-warn.diff
new file mode 100644
index 00000000000..0725ffe09f7
--- /dev/null
+++ b/debian/patches/01_disable-intel-classic-warn.diff
@@ -0,0 +1,14 @@
+Index: mesa/src/mesa/drivers/dri/intel/intel_context.c
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/intel/intel_context.c
++++ mesa/src/mesa/drivers/dri/intel/intel_context.c
+@@ -490,9 +490,6 @@
+ if (intel->bufmgr == NULL) {
+ if (ttm_disable) {
+ fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
+- } else {
+- fprintf(stderr, "Failed to initialize TTM buffer manager. "
+- "Falling back to classic.\n");
+ }
+
+ if (intelScreen->tex.size == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 86f17dca4fc..f7ae6157a68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_disable-intel-classic-warn.diff
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
04_osmesa_version.diff