mesa: Changes to 'debian-unstable'
debian/changelog | 19 +++++++++++++++++++
debian/libgl1-mesa-dri.install | 2 +-
debian/libgl1-mesa-dri.install.linux | 6 ++++++
debian/rules | 13 ++++---------
src/mesa/drivers/dri/common/dri_util.c | 3 +++
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 3 +++
6 files changed, 36 insertions(+), 10 deletions(-)
New commits:
commit 4edcabaa0c91d5f0b18b1e16918242aa01d43329
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:06:40 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 33621e6..5053c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10-3) UNRELEASED; urgency=low
+mesa (7.10-3) unstable; urgency=low
[ Julien Cristau ]
* debian/rules: RIP lpia.
@@ -15,7 +15,7 @@ mesa (7.10-3) UNRELEASED; urgency=low
r300g (Closes: #612380):
- dri_util: fail driCreateNewScreen if InitScreen is NULL
- -- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 16:06:38 +0100
mesa (7.10-2) unstable; urgency=low
commit e28687d4746c6f75b87637bb93cdc8122a31f2f2
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:06:33 2011 +0100
Document the cherry-pick, close #612380.
diff --git a/debian/changelog b/debian/changelog
index eb54c0d..33621e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ mesa (7.10-3) UNRELEASED; urgency=low
libgl1-mesa-dri.install.linux to that effect.
* According to Michel Dänzer, r600g (r600 gallium) is working well
enough to be shipped now. Let's ship it, then!
+ * Cherry-pick from upstream, fixing X's failure to start with UMS on
+ r300g (Closes: #612380):
+ - dri_util: fail driCreateNewScreen if InitScreen is NULL
-- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
commit 68dfc2dce9ae95cbc0571f1c14ce0e9e2bc3b279
Author: Paulo Zanoni <pzanoni@mandriva.com>
Date: Thu Jan 13 04:59:12 2011 -0800
dri_util: fail driCreateNewScreen if InitScreen is NULL
Without this, X doesn't start with UMS on r300g.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit dad914f6b2e5862a5174133f11276e975867be04)
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index a5b71bd..bf8cf6e 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -790,6 +790,9 @@ driCreateNewScreen(int scrn,
static const __DRIextension *emptyExtensionList[] = { NULL };
__DRIscreen *psp;
+ if (driDriverAPI.InitScreen == NULL)
+ return NULL;
+
psp = calloc(1, sizeof *psp);
if (!psp)
return NULL;
commit fca99e1a47894449210a76b9f15358f042812750
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 14:07:36 2011 +0100
Time to ship r600g.
Thanks to Michel Dänzer for the hint.
diff --git a/debian/changelog b/debian/changelog
index 0d4b4c9..eb54c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mesa (7.10-3) UNRELEASED; urgency=low
This fixes the FTBFS on GNU/kFreeBSD.
* Ship r300g (r300 gallium) on Linux only: Introduce Linux-specific
libgl1-mesa-dri.install.linux to that effect.
+ * According to Michel Dänzer, r600g (r600 gallium) is working well
+ enough to be shipped now. Let's ship it, then!
-- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
diff --git a/debian/libgl1-mesa-dri.install.linux b/debian/libgl1-mesa-dri.install.linux
index d724d6d..1b1e4de 100644
--- a/debian/libgl1-mesa-dri.install.linux
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -3,3 +3,4 @@ build/dri/lib/*_dri.so usr/lib/dri
# This part is Linux-specific:
build/dri/lib/gallium/r300_dri.so usr/lib/dri
+build/dri/lib/gallium/r600_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index adffe90..8353f05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -198,8 +198,6 @@ build-stamp: $(BUILD_STAMPS)
# Remove gallium drivers which replace existing classic drivers.
# Intel gallium is significantly behind the classic mesa drivers...
rm -f build/dri/lib/gallium/i915_dri.so
-# r600g is not yet in a fit state to ship
- rm -f build/dri/lib/gallium/r600_dri.so
>$@
$(STAMP)-build-%: configure
commit 69791880074b69d6831699cf7f000dd3c8868c48
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 14:04:03 2011 +0100
Ship r300g (r300 gallium) on Linux only.
Introduce Linux-specific libgl1-mesa-dri.install.linux to that effect.
diff --git a/debian/changelog b/debian/changelog
index 17c3399..0d4b4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mesa (7.10-3) UNRELEASED; urgency=low
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
This fixes the FTBFS on GNU/kFreeBSD.
+ * Ship r300g (r300 gallium) on Linux only: Introduce Linux-specific
+ libgl1-mesa-dri.install.linux to that effect.
-- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
index 8a77ea8..a470396 100644
--- a/debian/libgl1-mesa-dri.install
+++ b/debian/libgl1-mesa-dri.install
@@ -1,2 +1,2 @@
+# If this part gets modified, make sure to update .install.$os as well:
build/dri/lib/*_dri.so usr/lib/dri
-build/dri/lib/gallium/r300_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri.install.linux b/debian/libgl1-mesa-dri.install.linux
new file mode 100644
index 0000000..d724d6d
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -0,0 +1,5 @@
+# Keep this part in sync with libgl1-mesa-dri.install:
+build/dri/lib/*_dri.so usr/lib/dri
+
+# This part is Linux-specific:
+build/dri/lib/gallium/r300_dri.so usr/lib/dri
commit 3ad7804b7a41b054742f1403332ebfff481a1415
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 13:56:16 2011 +0100
Mention the GNU/kFreeBSD FTBFS goes away.
diff --git a/debian/changelog b/debian/changelog
index d1609c0..17c3399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (7.10-3) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
+ This fixes the FTBFS on GNU/kFreeBSD.
-- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
commit 982964e6a62fa830dcb23952ba6dbab818c6b791
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 13:47:08 2011 +0100
debian/rules: RIP lpia.
diff --git a/debian/changelog b/debian/changelog
index a4ea6cc..d1609c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
mesa (7.10-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
+ * debian/rules: RIP lpia.
+
+ [ Cyril Brulebois ]
* Cherry-pick from upstream (thanks to Dave Airlie for the hint):
- radeon: fix build on non-KMS systems.
diff --git a/debian/rules b/debian/rules
index 38b567b..adffe90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,18 +77,15 @@ else
EGL_DISPLAYS += drm
endif
- ifeq ($(DEB_HOST_ARCH), lpia)
- DRI_DRIVERS += i915 i965
- GALLIUM_DRIVERS += i915
- else ifneq ($(DEB_HOST_ARCH), s390)
+ ifneq ($(DEB_HOST_ARCH), s390)
DRI_DRIVERS += mach64 mga r128 r200 r600 radeon savage tdfx
- ifeq ($(DEB_HOST_ARCH_CPU), i386)
+ endif
+ ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i810 i915 i965 sis unichrome
GALLIUM_DRIVERS += i915
- else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
+ else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
DRI_DRIVERS += i915 i965 sis unichrome
GALLIUM_DRIVERS += i915
- endif
endif
endif
commit 6ad8a698c4ead6fe7d29a786552e35fb77d89950
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 13:19:31 2011 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index a27cd0c..a4ea6cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10-3) UNRELEASED; urgency=low
+
+ * Cherry-pick from upstream (thanks to Dave Airlie for the hint):
+ - radeon: fix build on non-KMS systems.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Feb 2011 13:18:38 +0100
+
mesa (7.10-2) unstable; urgency=low
* Fix FTBFS on i386: Add some files to debian/not-installed, on a
commit 8300e1747dec6c0ddd8807d8bc014536913868e8
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 3 06:02:43 2011 +1000
radeon: fix build on non-KMS systems.
Reported on irc by adamk.
(cherry picked from commit fb03510738e80716068a193a4078814d0e801120)
diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 6c2648b..60f1049 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -67,6 +67,9 @@ struct drm_radeon_info {
#define DRM_RADEON_INFO 0x1
#endif
+static inline void radeon_gem_get_kernel_name(struct radeon_bo *dummy, uint32_t *value)
+{
+}
static inline uint32_t radeon_gem_name_bo(struct radeon_bo *dummy)
{
Reply to: