libdrm: Changes to 'ubuntu'
.gitignore | 1
ChangeLog | 280
configure.ac | 18
debian/README.source | 2
debian/changelog | 51
debian/control | 20
debian/copyright | 291
debian/libdrm-dev.links | 1
debian/libdrm-intel1.symbols | 2
debian/libdrm-nouveau1.install | 2
debian/libdrm-nouveau1.symbols | 105
debian/libdrm-radeon1.symbols | 19
debian/libkms1.install | 1
debian/libkms1.symbols | 14
debian/patches/02_build_libkms_against_in_tree_drm.diff | 17
debian/patches/series | 1
debian/rules | 16
debian/xsfbs/xsfbs.mk | 35
include/drm/drm.h | 2
include/drm/drm_mode.h | 37
include/drm/i915_drm.h | 5
intel/intel_bufmgr.c | 20
intel/intel_bufmgr.h | 4
intel/intel_bufmgr_fake.c | 4
intel/intel_bufmgr_gem.c | 197
intel/intel_bufmgr_priv.h | 14
libkms/Makefile.am | 3
nouveau/Makefile.am | 1
nouveau/nouveau_class.h | 9019 ----------------
radeon/Makefile.am | 4
radeon/bof.c | 477
radeon/bof.h | 90
radeon/radeon_cs.h | 2
radeon/radeon_cs_gem.c | 102
tests/Makefile.am | 10
tests/vbltest/Makefile.am | 11
tests/vbltest/vbltest.c | 188
xf86atomic.h | 4
38 files changed, 1863 insertions(+), 9207 deletions(-)
New commits:
commit 7c70d8d55f8feb40d07c9eeb495b5bfcbebe9301
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Jun 10 18:58:41 2010 -0400
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 37967b7..88d8701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdrm (2.4.21-1ubuntu1) maverick; urgency=low
+
+ * Merge from debian experimental. Remaining Ubuntu changes:
+ - Enable libdrm-intel for ports architectures until plymouth is fixed to
+ not need it unconditionally.
+ - Move runtime libraries to /lib for plymouth.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 18:52:09 -0400
+
libdrm (2.4.21-1) experimental; urgency=low
[ Christopher James Halse Rogers ]
commit 119602662fcb75d635d79445a96ad68ab08ed58f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 10 23:09:44 2010 +0200
Upload to experimental
Also adjust patch description to fit its update.
diff --git a/debian/changelog b/debian/changelog
index 533ae0e..c937346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.21-1) UNRELEASED; urgency=low
+libdrm (2.4.21-1) experimental; urgency=low
[ Christopher James Halse Rogers ]
* debian/rules:
@@ -8,8 +8,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
* debian/control:
- Add libkms1, libkms1-dbg packages on linux
* debian/patches/02_build_libkms_against_in_tree_drm:
- - Build libkms against in-tree headers and link against libdrm as it
- uses symbols from libdrm.
+ - Link libkms against libdrm as it uses symbols from libdrm.
[ Robert Hooker ]
* New upstream release.
@@ -24,7 +23,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
* Same with libkms. Also don't set a minimum version to 2.4.20, since we
didn't ship it before anyway.
- -- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
+ -- Julien Cristau <jcristau@debian.org> Thu, 10 Jun 2010 23:24:54 +0200
libdrm (2.4.20-3) experimental; urgency=low
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff b/debian/patches/02_build_libkms_against_in_tree_drm.diff
index 7cbde37..25f8e43 100644
--- a/debian/patches/02_build_libkms_against_in_tree_drm.diff
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -1,6 +1,4 @@
-Description: Build libkms against in-tree xf86drm.h header
- libkms requires xf86drm.h, and uses symbols from libdrm. Add
- libdrm to LIBADD.
+Description: Add libdrm to LIBADD as libkms uses symbols from libdrm
Author: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
commit 5dfb61589b4964c7413fb72953c845d8bd060f15
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 10 23:23:59 2010 +0200
Mark libkms private symbols as such
Also don't set a minimum version to 2.4.20, since we didn't ship it
before anyway.
diff --git a/debian/changelog b/debian/changelog
index f256f88..533ae0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
copyright statements from the source tree.
* Mark new libdrm_radeon symbols private. They shouldn't actually be
exported.
+ * Same with libkms. Also don't set a minimum version to 2.4.20, since we
+ didn't ship it before anyway.
-- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
index 27f5638..0458f6e 100644
--- a/debian/libkms1.symbols
+++ b/debian/libkms1.symbols
@@ -1,13 +1,14 @@
libkms.so.1 libkms1 #MINVER#
- intel_create@Base 2.4.20
- kms_bo_create@Base 2.4.20
- kms_bo_destroy@Base 2.4.20
- kms_bo_get_prop@Base 2.4.20
- kms_bo_map@Base 2.4.20
- kms_bo_unmap@Base 2.4.20
- kms_create@Base 2.4.20
- kms_destroy@Base 2.4.20
- kms_get_prop@Base 2.4.20
- linux_create@Base 2.4.20
- nouveau_create@Base 2.4.20
- vmwgfx_create@Base 2.4.20
+| libkms-private
+ intel_create@Base 0 1
+ kms_bo_create@Base 0
+ kms_bo_destroy@Base 0
+ kms_bo_get_prop@Base 0
+ kms_bo_map@Base 0
+ kms_bo_unmap@Base 0
+ kms_create@Base 0
+ kms_destroy@Base 0
+ kms_get_prop@Base 0
+ linux_create@Base 0 1
+ nouveau_create@Base 0 1
+ vmwgfx_create@Base 0 1
diff --git a/debian/rules b/debian/rules
index 07904d8..f9b9a16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,7 +153,7 @@ ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4
endif
ifeq ($(LIBKMS), yes)
- dh_makeshlibs -plibkms1 -V'libkms1 (>=2.4.20)' -- -c4
+ dh_makeshlibs -plibkms1 -V'libkms1' -- -c4
endif
dh_installdeb -s
dh_shlibdeps -s
commit de345b3bae0d92e531cc9abf0e15651962ba9f23
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 10 23:16:13 2010 +0200
Mark new libdrm_radeon symbols private.
They shouldn't actually be exported.
diff --git a/debian/changelog b/debian/changelog
index ab9c7c5..f256f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update the copyright file to hopefully include all licenses variations and
copyright statements from the source tree.
+ * Mark new libdrm_radeon symbols private. They shouldn't actually be
+ exported.
-- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index fdc67ae..c900ea9 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,22 +1,23 @@
libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
- bof_array@Base 2.4.21
- bof_array_append@Base 2.4.21
- bof_array_get@Base 2.4.21
- bof_array_size@Base 2.4.21
- bof_blob@Base 2.4.21
- bof_blob_size@Base 2.4.21
- bof_blob_value@Base 2.4.21
- bof_decref@Base 2.4.21
- bof_dump_file@Base 2.4.21
- bof_incref@Base 2.4.21
- bof_int32@Base 2.4.21
- bof_int32_value@Base 2.4.21
- bof_load_file@Base 2.4.21
- bof_object@Base 2.4.21
- bof_object_get@Base 2.4.21
- bof_object_set@Base 2.4.21
- bof_print@Base 2.4.21
- bof_string@Base 2.4.21
+| libdrm-radeon-private
+ bof_array@Base 0 1
+ bof_array_append@Base 0 1
+ bof_array_get@Base 0 1
+ bof_array_size@Base 0 1
+ bof_blob@Base 0 1
+ bof_blob_size@Base 0 1
+ bof_blob_value@Base 0 1
+ bof_decref@Base 0 1
+ bof_dump_file@Base 0 1
+ bof_incref@Base 0 1
+ bof_int32@Base 0 1
+ bof_int32_value@Base 0 1
+ bof_load_file@Base 0 1
+ bof_object@Base 0 1
+ bof_object_get@Base 0 1
+ bof_object_set@Base 0 1
+ bof_print@Base 0 1
+ bof_string@Base 0 1
radeon_bo_debug@Base 2.4.17
radeon_bo_get_handle@Base 2.4.17
radeon_bo_get_src_domain@Base 2.4.17
diff --git a/debian/rules b/debian/rules
index c2c42f8..07904d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,7 +150,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (>= 2.4.20-3~)' -- -c4
endif
ifeq ($(RADEON), yes)
- dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.21)' -- -c4
+ dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4
endif
ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1 (>=2.4.20)' -- -c4
commit e3afb3b0605e650a6661306f68f8f91a6e9a7f70
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 10 23:04:08 2010 +0200
Update the copyright file
Hopefully include all licenses variations and copyright statements from
the source tree.
Some oddities:
- name of copyright holder different from the name listed in the license
notice
- second paragraph moved below the third, and still referencing the
"next paragraph" (not included here)
- probably some others I forgot
diff --git a/debian/changelog b/debian/changelog
index 1ef2372..ab9c7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
* Refresh 02_build_libkms_against_in_tree_drm.
* Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
+ [ Julien Cristau ]
+ * Update the copyright file to hopefully include all licenses variations and
+ copyright statements from the source tree.
+
-- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
libdrm (2.4.20-3) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index cd14d51..3715aaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,6 @@ http://dri.freedesktop.org/libdrm/
It was debianized by Marcelo E. Magallon <mmagallo@debian.org> on
Fri, 19 Aug 2005 21:11:18 -0600.
-Copyright Holder: Adam Jackson <ajax at nwnk dot net>
-
-License:
Copyright 2005 Adam Jackson.
@@ -30,29 +27,10 @@ License:
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------
-
- Copyright (c) 1998-2003 VIA Technologies, Inc.
- Copyright (c) 1999 Wittawat Yamwong
- Copyright (c) 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
- Copyright (c) 2000 VA Linux Systems, Inc., Sunnyvale, California.
- Copyright (c) 2000 Gareth Hughes
- Copyright (c) 2001-2003 S3 Graphics, Inc.
- Copyright (c) 2002 Frank C. Earl
- Copyright (c) 2002-2003 Leif Delgass
- Copyright (c) 2002-2003, 2006-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA
- Copyright (c) 2004 Felix Kuehling
- Copyright (c) 2005 Eric Anholt
- Copyright (c) 2005 Stephane Marchesin.
- Copyright (c) 2006-2008 Dmitry Baryshkov, Laurent Carlier, Matthieu Castet,
- Dawid Gajownik, Jeremy Kolb, Stephane Loeuillet, Patrice Mandin,
- Stephane Marchesin, Serge Martin, Sylvain Munaut, Simon Raffeiner,
- Ben Skeggs, Erik Waling
- Copyright (c) 2007 Nouveau Project
- Copyright (c) 2007-2008 Dave Airlie <airlied@linux.ie>
- Copyright (c) 2007-2008 Jakob Bornecrantz <wallbraker@gmail.com>
- Copyright (c) 2007-2009 Intel Corporation
- Copyright (c) 2008 Red Hat Inc.
+
+ Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
@@ -75,3 +53,264 @@ License:
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+
+ Copyright (c) 2007-2008 Dave Airlie <airlied@linux.ie>
+ Copyright (c) 2007-2008 Jakob Bornecrantz <wallbraker@gmail.com>
+ Copyright (c) 2008 Red Hat Inc.
+ Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA
+ Copyright (c) 2007-2009 Intel Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+
+
+ Copyright 2002-2006 Tungsten Graphics, Inc., Cedar Park, Texas.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright 2000 Gareth Hughes
+ Copyright 2002 Frank C. Earl
+ Copyright 2002-2003 Leif Delgass
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ Copyright 2005 Stephane Marchesin.
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright 2004 Felix Kuehling
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sub license,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright 2005 Eric Anholt
+ Copyright © 2007-2008 Intel Corporation
+ Copyright © 2008 Jérôme Glisse
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+
+ Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sub license,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+
+ Copyright © 2009 VMware, Inc., Palo Alto, CA., USA
+ Copyright © 2007-2009 Red Hat Inc.
+ Copyright © 2007 Intel Corporation
+ Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
+ Copyright © 2008 Dave Airlie
+ Copyright © 2008 Jérôme Glisse
+ Copyright © 2008 Nicolai Haehnle
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sub license, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright (C) 1999 Wittawat Yamwong
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,?
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR?
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE?
+ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Copyright (c) 2007 Nouveau Project
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+
+ Copyright 2010 Jerome Glisse <glisse@freedesktop.org>
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ on the rights to use, copy, modify, merge, publish, distribute, sub
+ license, and/or sell copies of the Software, and to permit persons to whom
+ the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
commit 12dedbc4491331de9f13e66aa10328560f28f2f0
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Jun 10 16:37:51 2010 -0400
Add 02_build_libkms_against_in_tree_drm.diff back, refresh it with just the needed hunk.
diff --git a/debian/changelog b/debian/changelog
index ee8066e..1ef2372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,14 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
kernel so we might as well build the userspace bits.
* debian/control:
- Add libkms1, libkms1-dbg packages on linux
+ * debian/patches/02_build_libkms_against_in_tree_drm:
+ - Build libkms against in-tree headers and link against libdrm as it
+ uses symbols from libdrm.
[ Robert Hooker ]
* New upstream release.
+ * Refresh 02_build_libkms_against_in_tree_drm.
+ * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
-- Robert Hooker <sarvatt@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff b/debian/patches/02_build_libkms_against_in_tree_drm.diff
new file mode 100644
index 0000000..7cbde37
--- /dev/null
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -0,0 +1,19 @@
+Description: Build libkms against in-tree xf86drm.h header
+ libkms requires xf86drm.h, and uses symbols from libdrm. Add
+ libdrm to LIBADD.
+Author: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
+
+Index: libdrm/libkms/Makefile.am
+===================================================================
+--- libdrm.orig/libkms/Makefile.am
++++ libdrm/libkms/Makefile.am
+@@ -6,7 +6,7 @@ AM_CFLAGS = \
+ libkms_la_LTLIBRARIES = libkms.la
+ libkms_ladir = $(libdir)
+ libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libkms_la_LIBADD =
++libkms_la_LIBADD = ../libdrm.la
+
+ #if HAVE_LIBUDEV
+ #libkms_la_LIBADD += $(LIBUDEV_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..e23f0b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_build_libkms_against_in_tree_drm.diff
commit b47654f4e18616d3e2c2810aba8eba205fedeb6a
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Jun 10 15:08:53 2010 -0400
Refresh intel and radeon symbols.
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 68b9c37..24b01cb 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -13,8 +13,10 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
drm_intel_bo_gem_create_from_name@Base 2.4.1
drm_intel_bo_get_subdata@Base 2.4.1
drm_intel_bo_get_tiling@Base 2.4.1
+ drm_intel_bo_is_reusable@Base 2.4.21
drm_intel_bo_madvise@Base 2.4.16
drm_intel_bo_map@Base 2.4.1
+ drm_intel_bo_mrb_exec@Base 2.4.21
drm_intel_bo_pin@Base 2.4.1
drm_intel_bo_reference@Base 2.4.1
drm_intel_bo_references@Base 2.4.15
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index 2cc83e9..fdc67ae 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,4 +1,22 @@
libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
+ bof_array@Base 2.4.21
+ bof_array_append@Base 2.4.21
+ bof_array_get@Base 2.4.21
+ bof_array_size@Base 2.4.21
+ bof_blob@Base 2.4.21
+ bof_blob_size@Base 2.4.21
+ bof_blob_value@Base 2.4.21
+ bof_decref@Base 2.4.21
+ bof_dump_file@Base 2.4.21
+ bof_incref@Base 2.4.21
+ bof_int32@Base 2.4.21
+ bof_int32_value@Base 2.4.21
+ bof_load_file@Base 2.4.21
+ bof_object@Base 2.4.21
+ bof_object_get@Base 2.4.21
+ bof_object_set@Base 2.4.21
+ bof_print@Base 2.4.21
+ bof_string@Base 2.4.21
radeon_bo_debug@Base 2.4.17
radeon_bo_get_handle@Base 2.4.17
radeon_bo_get_src_domain@Base 2.4.17
diff --git a/debian/rules b/debian/rules
index 8f55cda..c2c42f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,13 +144,13 @@ endif
dh_fixperms -s
dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.17)' -- -c4
ifeq ($(INTEL), yes)
- dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.20)' -- -c4
+ dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.21)' -- -c4
endif
ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (>= 2.4.20-3~)' -- -c4
endif
ifeq ($(RADEON), yes)
- dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4
+ dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.21)' -- -c4
endif
ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1 (>=2.4.20)' -- -c4
commit 8165277148da2669892f3da6c34da49565f2ba3a
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Jun 10 14:59:54 2010 -0400
Drop 02_build_libkms_against_in_tree_drm.diff (upstream)
diff --git a/debian/changelog b/debian/changelog
index 026aa47..ee8066e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,6 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
kernel so we might as well build the userspace bits.
* debian/control:
- Add libkms1, libkms1-dbg packages on linux
- * debian/patches/02_build_libkms_against_in_tree_drm:
- - Build libkms against in-tree headers and link against libdrm as it
- uses symbols from libdrm.
[ Robert Hooker ]
* New upstream release.
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff b/debian/patches/02_build_libkms_against_in_tree_drm.diff
deleted file mode 100644
index a80d734..0000000
--- a/debian/patches/02_build_libkms_against_in_tree_drm.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Build libkms against in-tree xf86drm.h header
- libkms requires xf86drm.h, and uses symbols from libdrm. Add
- an appropriate search path to CFLAGS, and libdrm to LIBADD.
-Author: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
-
-Index: libdrm/libkms/Makefile.am
-===================================================================
---- libdrm.orig/libkms/Makefile.am 2010-05-26 16:35:15.092706440 +1000
-+++ libdrm/libkms/Makefile.am 2010-05-26 16:42:41.722739824 +1000
-@@ -1,11 +1,12 @@
- AM_CFLAGS = \
- $(WARN_CFLAGS) \
-- -I$(top_srcdir)/include/drm
-+ -I$(top_srcdir)/include/drm \
-+ -I$(top_srcdir)
-
- libkms_la_LTLIBRARIES = libkms.la
- libkms_ladir = $(libdir)
- libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libkms_la_LIBADD =
-+libkms_la_LIBADD = ../libdrm.la
-
- #if HAVE_LIBUDEV
- #libkms_la_LIBADD += $(LIBUDEV_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index e23f0b1..8ca2297 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_default_perms.diff
-02_build_libkms_against_in_tree_drm.diff
commit cf0a21ccc817eb8c110b75cb237283fe0eed02e3
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Jun 10 14:48:31 2010 -0400
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index ac0dc3c..d5a1664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,283 @@
+commit 65ec8d7699267cc59777d531f545a82a14341480
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 10 08:59:05 2010 -0700
+
+ Bump version to 2.4.21 for release.
+
+commit b8c4e5836cf1eff3e8c666f24567bd4c2fa31140
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 10 09:03:41 2010 -0700
+
+ Fix radeon distcheck.
+
+commit 4f7704aea76b3d93d997d2ff815541d0ac373535
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 10 08:58:08 2010 -0700
+
+ intel: Fix several other paths for buffers pointing at themselves.
+
+commit 0ec768e67aec8b1ded9bcf575ad1c0beb28cc0ca
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Jun 4 17:09:11 2010 -0700
+
+ intel: Add more intermediate sizes of cache buckets between powers of 2.
+
+ We had two cases recently where the rounding to powers of two hurt
+ badly: 4:2:0 YUV HD video frames would round up from 2.2MB to 4MB, and
+ Urban Terror was hitting aperture size limitations. For UT, this is
+ because mipmap trees for power of two texture sizes will land right in
+ the middle between two cache buckets.
+
+ By giving a few more sizes between powers of two, Urban Terror on my
+ 945 ends up consuming 207MB of GEM objects instead of 272MB, and HD
+ video decode on Ironlake goes from 99MB to 75MB.
+
+ cairo-perf-diff of the benchmarks for gl and xlib shows a 1.09x and
+ 1.06x speedup and a 1.07x, 1.08x, and 1.11x slowdown. From this, I
+ think this patch was really a no-op in terms of performance for these
+ CPU-bound workloads.
+
+commit e65caeba9ed0e6c53830d944248aaae2228351ab
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jun 9 10:08:41 2010 +0100
+
+ intel: Convert to untiled pitches if surface is too large for tiling.
+
+ If the pitch is too large for the hardware to tile, recompute the
+ required surface size based on the untiled pitch and alignments. For the
+ older hardware, which has smaller limits and greater restrictions, this
+ may be a considerable saving in allocation size.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f179137f8f5bf272b79266575121c7a04038290c
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 7 14:22:36 2010 -0700
+
+ Allow a buffer to point at itself and still get relocs.
+
+ I'm using this in experiments with the i965 Mesa driver.
+
+commit 66375fd6e8d3e95df5d124883a1426460c1b8ed8
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Wed Jun 2 10:07:37 2010 +0800
+
+ intel: Add support for kernel multi-ringbuffer API.
+
+ This introduces a new API to exec on BSD ring buffer, for H.264 VLD
+ decoding.
+
+ Signed-off-by: Xiang Hai hao <haihao.xiang@intel.com>
+ Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
+
+commit 73a42a645201a85ce2fe4fc77754df67e5097fc9
+Author: Jesse Barnes <jbarnes@jbarnes-asus.(none)>
+Date: Wed Jun 2 18:27:24 2010 -0700
+
+ add vbltest to .gitignore
+
+commit ae57dcf6e063860200b7949d5e2365e80ac4aea7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jun 1 19:23:42 2010 +0100
+
+ libkms: Fix include paths
+
+ Otherwise xf86drm.h isn't found, or the wrong one.
+
+commit 607e228c263d5d171bd0615d5d93202dda371e5f
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue May 25 20:13:37 2010 -0700
+
+ Enable silent automake rules.
+
+commit 58e54f62c91aff4f4be96c6d8771ca9110969f49
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue May 25 20:11:23 2010 -0700
+
+ intel_bufmgr_fake: fix compile warning.
+
+commit fcf3e616eeeb289f96af1436d809f0a1a42bebb7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon May 24 18:35:41 2010 +0100
+
+ intel: Don't change tiling mode unless the kernel reports success.
+
+ Fixes:
+
+ Bug 26686 - Some textures are distorted with libdrm 2.4.18 in GTAVC>A3
+ http://bugs.freedesktop.org/show_bug.cgi?id=26686
+
+ This bug continues to haunt me. The kernel SET_TILING ioctl is
+ inconsistent in its return values when reporting an error. If one of its
+ sanity checks fail, then the input values are left unchanged. If the
+ kernel later fails to change the tiling mode, then the input values are
+ modified to match the current tiling on the object. In short, userspace
+ cannot trust the return values upon error and so we must assume that
+ upon error our current tiling mode matches reality and not update.
+
+commit a3305b076c005e0d3bd55da0214e91413cf65b48
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 13 08:24:28 2010 +0100
+
+ Revert "intel: We don't need to take the bufmgr lock whilst mapping."
+
+ This reverts commit 7ca558494dd3f68f29bb6ca981de9b8f49620b60.
+
+ This was pushed ahead of an essential review of bo level locking in
+ mesa, without which we cannot know whether removing this lock is safe.
+
+commit 52a3e9df629952e58bd019b8cd4cda1dd254a543
+Author: Jonathan Callen <abcd@gentoo.org>
+Date: Wed May 12 13:55:34 2010 -0400
+
+ Only build tests in make check
+
+ Currently, all the tests for libdrm are built during 'make all', even
+ if you do not wish to run tests. Attached is a patch, based on
+ version 2.4.15, to make the tests build in 'make check'.
+
+commit 62731b84114e5dd3310b465921955db14278c256
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Wed May 12 13:34:25 2010 -0400
+
+ Pull in new kernel headers
+
+ Changes struct drm_mode_crtc_page_flip to use __u32 instead of uint32_t,
+ fixes
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=26994
+
+commit 07e7589d86624e9c1ca4c38d00cf6886e1445ae2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 11 08:54:06 2010 +0100
+
+ intel: query whether a buffer is reusable.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7ca558494dd3f68f29bb6ca981de9b8f49620b60
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 1 17:15:39 2010 +0100
+
+ intel: We don't need to take the bufmgr lock whilst mapping.
+
+commit 6293152eb065016a2e5e4fcd047c2db5c2fb0f36
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Wed Apr 28 08:25:30 2010 +0200
+
+ vbltest: Doesn't need intel stuff.
+
+ Fixes build without libdrm_intel.
+
+commit c42d1a10e37cc2ff378511a058b89a6f8eddf1c0
+Author: Jesse Barnes <jbarnes@jbarnes-acer.(none)>
+Date: Tue Apr 27 15:43:20 2010 -0400
+
+ tests: add new vblank test
+
+ Simple test for event frequency.
+
+commit af98ccf4dd5dcb1b904ec32b9bd1521e6bf7dda5
+Author: Marek Olšák <maraeo@gmail.com>
+Date: Mon Apr 26 20:06:53 2010 +0200
+
+ radeon: use the const qualifier in radeon_cs_write_table
+
+ Signed-off-by: Marek Olšák <maraeo@gmail.com>
+
+commit c9065c5963db1b8196d278c47b8da2c33a3c49d1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Apr 16 17:34:11 2010 -0700
+
+ Correct the Solaris definitions of atomic_add & atomic_dec
+
+ The #defines added in 966c9907c040b4fe4b288b4a9d82598797aee743 were
+ mapping these to functions that don't exist.
Reply to: