diff options
Diffstat (limited to 'x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c')
| -rw-r--r-- | x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c index 9771d08562b3..39f3729e83be 100644 --- a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c +++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c @@ -1,18 +1,14 @@ ---- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 -+++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 -@@ -658,7 +658,11 @@ - if (file) { - size_t len = 0; - char *line = NULL; -+#ifdef __GLIBC__ - while (getline(&line, &len, file) != -1) { -+#else -+ while ((line = fgetln(file, &len)) != (char *) NULL) { -+#endif - int mb; - if (sscanf(line, "cache size : %d KB", &mb) == 1) { - /* Paranoid check against gargantuan caches */ -@@ -1666,7 +1670,8 @@ +--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200 ++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200 +@@ -25,6 +25,7 @@ + * + */ + ++#define _WITH_GETLINE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -1890,7 +1891,8 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags) { @@ -22,7 +18,7 @@ DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags)); -@@ -1868,7 +1873,8 @@ +@@ -2104,7 +2106,8 @@ static bool kgem_retire__flushing(struct kgem *kgem) { @@ -32,7 +28,7 @@ bool retired = false; list_for_each_entry_safe(bo, next, &kgem->flushing, request) { -@@ -2073,7 +2079,8 @@ +@@ -2309,7 +2312,8 @@ static void kgem_commit(struct kgem *kgem) { struct kgem_request *rq = kgem->next_request; @@ -42,7 +38,7 @@ list_for_each_entry_safe(bo, next, &rq->buffers, request) { assert(next->request.prev == &bo->request); -@@ -2154,7 +2161,8 @@ +@@ -2390,7 +2394,8 @@ static void kgem_finish_buffers(struct kgem *kgem) { @@ -51,8 +47,8 @@ + struct kgem_buffer *next; list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { - DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n", -@@ -2963,7 +2971,8 @@ + DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%s\n", +@@ -3252,7 +3257,8 @@ static struct kgem_bo * search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags) { @@ -62,7 +58,7 @@ bool use_active = (flags & CREATE_INACTIVE) == 0; struct list *cache; -@@ -3521,7 +3530,7 @@ +@@ -3855,7 +3861,7 @@ uint32_t flags) { struct list *cache; @@ -71,7 +67,7 @@ uint32_t pitch, tiled_height, size; uint32_t handle; int i, bucket, retry; -@@ -4834,7 +4843,7 @@ +@@ -5302,7 +5308,7 @@ void kgem_clear_dirty(struct kgem *kgem) { struct list * const buffers = &kgem->next_request->buffers; @@ -79,8 +75,8 @@ + struct kgem_bo *bo = NULL; list_for_each_entry(bo, buffers, request) { - if (!bo->dirty) -@@ -5072,7 +5081,7 @@ + if (!bo->gpu_dirty) +@@ -5578,7 +5584,7 @@ uint32_t size, uint32_t flags, void **ret) { |