[arch-commits] Commit in libdrm/trunk (2 files)
Jan de Groot
jgc at archlinux.org
Wed May 26 18:45:58 UTC 2010
Date: Wednesday, May 26, 2010 @ 14:45:58
Author: jgc
Revision: 81114
Update to git (up to fcf3e616eeeb2)
Modified:
libdrm/trunk/PKGBUILD
Deleted:
libdrm/trunk/intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch
--------------------------------------------------------------------------+
PKGBUILD | 8 -
intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch | 55 ----------
2 files changed, 4 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-26 18:21:58 UTC (rev 81113)
+++ PKGBUILD 2010-05-26 18:45:58 UTC (rev 81114)
@@ -3,7 +3,7 @@
pkgname=libdrm
pkgver=2.4.20
-pkgrel=2
+pkgrel=3
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
license=('custom')
@@ -13,16 +13,16 @@
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
COPYING
- intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch)
+ git-fixes.patch)
md5sums=('3c56e03172b236e14905ef9a68ba2f97'
'9b5ec3bbebe86921e2057694c42f65b8'
'ba65e71c481b94ef0fb6c23c7f21ffa1'
- '2dd7d84d3ebbc23c92b602104fae5df3')
+ '6a2cf84d7f7a423b5238e2c465312cd3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/git-fixes.patch" || return 1
patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1
- patch -p1 -i "${srcdir}/intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch" || return 1
libtoolize --force || return 1
aclocal || return 1
autoconf || return 1
Deleted: intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch
===================================================================
--- intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch 2010-05-26 18:21:58 UTC (rev 81113)
+++ intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch 2010-05-26 18:45:58 UTC (rev 81114)
@@ -1,55 +0,0 @@
-From 3506173ba7e726a9d0a17ec42734a925a885b01e Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Sun, 11 Apr 2010 17:40:38 +0000
-Subject: intel: Use the correct size when allocating reloc_target_info array
-
-Thomas tracked down this error with kdm and commit b509640:
-
-==4320== Invalid write of size 8
-==4320== at 0x9A97998: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
-==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
-==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF13827: brw_emit_vertices (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xB256824: vbo_exec_vtx_flush (in /usr/lib/xorg/modules/dri/libdricore.so)
-==4320== by 0xB2523BB: vbo_exec_FlushVertices_internal (in /usr/lib/xorg/modules/dri/libdricore.so)
-==4320== by 0xB252411: vbo_exec_FlushVertices (in /usr/lib/xorg/modules/dri/libdricore.so)
-==4320== by 0xB195A3D: _mesa_PopAttrib (in /usr/lib/xorg/modules/dri/libdricore.so)
-==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
-==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
-==4320== Address 0x126a8b80 is 0 bytes after a block of size 16,368 alloc'd
-==4320== at 0x4C23E03: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
-==4320== by 0x9A97A64: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
-==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
-==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF191DB: upload_binding_table_pointers (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
-==4320== by 0xB255EF6: vbo_exec_DrawArrays (in /usr/lib/xorg/modules/dri/libdricore.so)
-==4320== by 0x8DF67A3: __glXDisp_DrawArrays (in /usr/lib/xorg/modules/extensions/libglx.xorg)
-==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
-==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
-==4320== by 0x446293: ??? (in /usr/bin/Xorg)
-
-which is simply due to only allocating space for the pointers and not
-the structs themselves. D'oh.
-
-Reported-by: Thomas Bächler <thomas at archlinux.org>
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 8e46e37..a2cf6e6 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -470,7 +470,7 @@ drm_intel_setup_reloc_list(drm_intel_bo *bo)
- bo_gem->relocs = malloc(max_relocs *
- sizeof(struct drm_i915_gem_relocation_entry));
- bo_gem->reloc_target_info = malloc(max_relocs *
-- sizeof(drm_intel_reloc_target *));
-+ sizeof(drm_intel_reloc_target));
- if (bo_gem->relocs == NULL || bo_gem->reloc_target_info == NULL) {
- bo_gem->has_error = 1;
-
---
-cgit v0.8.3-6-g21f6
More information about the arch-commits
mailing list