debian/changelog | 16 ++++++++++++++++
debian/libdrm-intel1.symbols | 2 +-
debian/rules | 2 +-
intel/intel_bufmgr.c | 4 ++++
intel/intel_bufmgr_gem.c | 29 +++++++++++++++++++++++++++++
5 files changed, 51 insertions(+), 2 deletions(-)
New commits:
commit 8dbd9c6ac6f5a5803a39b93d65cdd9a9fb7e21b2
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 16 11:44:48 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 26372aa..9e5318e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.23-3) UNRELEASED; urgency=low
+libdrm (2.4.23-3) unstable; urgency=low
* Cherry-pick from upstream:
- intel: Fallback to old exec if no mrb_exec is available
@@ -12,7 +12,7 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
(Closes: #609299).
* Bump the libdrm-intel1 shlibs version for consistency.
- -- Cyril Brulebois <k...@debian.org> Wed, 16 Feb 2011 11:04:43 +0100
+ -- Cyril Brulebois <k...@debian.org> Wed, 16 Feb 2011 11:44:44 +0100
libdrm (2.4.23-2) unstable; urgency=low
commit af6d552526b32d1b713a0fe9c4f9c1385b945a2e
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 16 11:40:39 2011 +0100
Make lintian/backporters happy…
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 750f65b..3634492 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -16,7 +16,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
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.23-3
+ drm_intel_bo_mrb_exec@Base 2.4.23-3~
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/rules b/debian/rules
index 69b2e89..4d838ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ 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.23-3)' -- -c4
+ dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.23-3~)' -- -c4
endif
ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4
commit ff3f97e2d8f6643324361806f86379675c7d25a9
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 16 11:39:46 2011 +0100
Bump the libdrm-intel1 shlibs version for consistency.
diff --git a/debian/changelog b/debian/changelog
index 51eed55..26372aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
libdrm-intel1's symbols file. While the former version is alright
from a shared object point of view, runtime doesn't seem to agree
(Closes: #609299).
+ * Bump the libdrm-intel1 shlibs version for consistency.
-- Cyril Brulebois <k...@debian.org> Wed, 16 Feb 2011 11:04:43 +0100
diff --git a/debian/rules b/debian/rules
index 82741af..69b2e89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ 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.21)' -- -c4
+ dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.23-3)' -- -c4
endif
ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4
commit 070f3a6c02359e5966a747b5aa79d2bdf21140b6
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 16 11:32:06 2011 +0100
Bump dependency to 2.4.23-3 for the drm_intel_bo_mrb_exec symbol.
Hopefully closes: #609299.
diff --git a/debian/changelog b/debian/changelog
index 7ff3e0c..51eed55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
- intel: Remember named bo
* The first of those fixes should fix some failures to submit batch
buffer (Closes: #612766).
+ * Bump dependency to 2.4.23-3 for the drm_intel_bo_mrb_exec symbol in
+ libdrm-intel1's symbols file. While the former version is alright
+ from a shared object point of view, runtime doesn't seem to agree
+ (Closes: #609299).
-- Cyril Brulebois <k...@debian.org> Wed, 16 Feb 2011 11:04:43 +0100
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 24b01cb..750f65b 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -16,7 +16,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
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_mrb_exec@Base 2.4.23-3
drm_intel_bo_pin@Base 2.4.1
drm_intel_bo_reference@Base 2.4.1
drm_intel_bo_references@Base 2.4.15
commit 961bd23b6adb02726bd3307d1b53feedfa592945
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 16 11:11:00 2011 +0100
Document cherry-picking fixes, and close #612766.
diff --git a/debian/changelog b/debian/changelog
index a83bdd2..7ff3e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libdrm (2.4.23-3) UNRELEASED; urgency=low
+
+ * Cherry-pick from upstream:
+ - intel: Fallback to old exec if no mrb_exec is available
+ - intel: Set the public handle after opening by name
+ - intel: Remember named bo
+ * The first of those fixes should fix some failures to submit batch
+ buffer (Closes: #612766).
+
+ -- Cyril Brulebois <k...@debian.org> Wed, 16 Feb 2011 11:04:43 +0100
+
libdrm (2.4.23-2) unstable; urgency=low
* Upload to unstable.
commit ddf37b2005ab9635d2c6f06187ee6fa0db42a230
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Mon Feb 14 09:39:06 2011 +0000
intel: Remember named bo
... and if asked to open a bo by the same global name, return a fresh
reference to the previously allocated buffer.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
(cherry picked from commit 36d4939343d8789d9066f7245fa2d4fe69119dd8)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 4702c51..1c2d765 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
int num_buckets;
time_t time;
+ drmMMListHead named;
+
uint64_t gtt_size;
int available_fences;
int pci_device;
@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
* Kenel-assigned global name for this object
*/
unsigned int global_name;
+ drmMMListHead name_list;
/**
* Index of the buffer within the validation list while preparing a
@@ -690,6 +693,8 @@ retry:
drm_intel_gem_bo_free(&bo_gem->bo);
return NULL;
}
+
+ DRMINITLISTHEAD(&bo_gem->name_list);
}
bo_gem->name = name;
@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
int ret;
struct drm_gem_open open_arg;
struct drm_i915_gem_get_tiling get_tiling;
+ drmMMListHead *list;
+
+ /* At the moment most applications only have a few named bo.
+ * For instance, in a DRI client only the render buffers passed
+ * between X and the client are named. And since X returns the
+ * alternating names for the front/back buffer a linear search
+ * provides a sufficiently fast match.
+ */
+ for (list = bufmgr_gem->named.next;
+ list != &bufmgr_gem->named;
+ list = list->next) {
+ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
+ if (bo_gem->global_name == handle) {
+ drm_intel_gem_bo_reference(&bo_gem->bo);
+ return &bo_gem->bo;
+ }
+ }
bo_gem = calloc(1, sizeof(*bo_gem));
if (!bo_gem)
@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
/* XXX stride is unknown */
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
return &bo_gem->bo;
@@ -925,6 +948,8 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t
time)
bo_gem->relocs = NULL;
}
+ DRMLISTDEL(&bo_gem->name_list);
+
bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
/* Put the buffer into our internal cache for reuse if we can. */
if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
@@ -1771,6 +1796,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
return -errno;
bo_gem->global_name = flink.name;
bo_gem->reusable = 0;
+
+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
}
*name = bo_gem->global_name;
@@ -2217,6 +2244,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
drm_intel_gem_get_pipe_from_crtc_id;
bufmgr_gem->bufmgr.bo_references = drm_intel_gem_bo_references;
+ DRMINITLISTHEAD(&bufmgr_gem->named);
init_cache_buckets(bufmgr_gem);
return &bufmgr_gem->bufmgr;
commit 198d7bc698faaaf3c37d2a1b9379b3c622d44f12
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Mon Feb 14 09:27:05 2011 +0000
intel: Set the public handle after opening by name
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
(cherry picked from commit 53581b6210c024044e0065527d1506e6f5657ef5)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index c5bb588..4702c51 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -816,6 +816,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
atomic_set(&bo_gem->refcount, 1);
bo_gem->validate_index = -1;
bo_gem->gem_handle = open_arg.handle;
+ bo_gem->bo.handle = open_arg.handle;
bo_gem->global_name = handle;
bo_gem->reusable = 0;
commit e4aa4696a44b2bb571bf7ba56ccdff921e562205
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Wed Jan 12 10:57:46 2011 +0000
intel: Fallback to old exec if no mrb_exec is available
Reported-by: Torsten Hilbrich <torsten.hilbr...@secunet.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33016
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
(cherry picked from commit 6717b7579f84d05e45e7846d2b6e767760461709)
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index f93a870..b138e61 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -143,6 +143,10 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
cliprects, num_cliprects, DR4,
ring_flag);
+ if (ring_flag == 0)
+ return bo->bufmgr->bo_exec(bo, used,
+ cliprects, num_cliprects, DR4);
+
return -ENODEV;
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ppevh-0005v8...@alioth.debian.org
