xf86-video-intel: 2 commits - src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Aug 7 05:26:59 PDT 2015
src/sna/kgem.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6bab82b91d64af2e31d9f5fe7705c68caf09004b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Aug 7 13:25:14 2015 +0100
sna: Always prefer a fresh allocation for the batch if !llc
An unwanted subtle change in preference from
commit 8c465d0fbf84b1d29c54d620f09063d2b7ccfeb8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Aug 7 10:15:42 2015 +0100
sna: Fallback after a bo allocation failure for the batch
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 9925628..33f9f7e 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3858,7 +3858,7 @@ out_16384:
size = kgem->nbatch * sizeof(uint32_t);
#endif
- if (!kgem->batch_bo) {
+ if (!kgem->batch_bo || !kgem->has_llc) {
bo = kgem_create_linear(kgem, size, CREATE_NO_THROTTLE);
if (bo) {
write:
commit a00fdce1fdf21379887511e7d4247ca401dc3a77
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Aug 7 13:24:13 2015 +0100
sna: Add a little more DBG information to kgem_retire()
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 30058dc..9925628 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3012,7 +3012,7 @@ static bool kgem_retire__flushing(struct kgem *kgem)
int count = 0;
list_for_each_entry(bo, &kgem->flushing, request)
count++;
- DBG(("%s: %d bo on flushing list\n", __FUNCTION__, count));
+ DBG(("%s: %d bo on flushing list, retired? %d\n", __FUNCTION__, count, retired));
}
#endif
@@ -3111,6 +3111,8 @@ static bool kgem_retire__requests_ring(struct kgem *kgem, int ring)
while (!list_is_empty(&kgem->requests[ring])) {
struct kgem_request *rq;
+ DBG(("%s: retiring ring %d\n", __FUNCTION__, ring));
+
rq = list_first_entry(&kgem->requests[ring],
struct kgem_request,
list);
@@ -3135,8 +3137,8 @@ static bool kgem_retire__requests_ring(struct kgem *kgem, int ring)
struct kgem_request,
list)->bo;
- DBG(("%s: ring=%d, %d outstanding requests, oldest=%d\n",
- __FUNCTION__, ring, count, bo ? bo->handle : 0));
+ DBG(("%s: ring=%d, %d outstanding requests, oldest=%d, retired? %d\n",
+ __FUNCTION__, ring, count, bo ? bo->handle : 0, retired));
}
#endif
More information about the xorg-commit
mailing list