From b69b42634619076d4163ae144f0154880d1928cd Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Thu, 26 Apr 2007 14:15:55 +0300 Subject: libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's. We no longer import libdrm in the xserver. --- libdrm/xf86drm.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libdrm/xf86drm.c') diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 2473162b..f07e853f 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -31,10 +31,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - #ifdef HAVE_CONFIG_H # include #endif -- cgit v1.2.3 From cf7c90f7b4087764cdd5f6c73328b0cf9dcb0b78 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Wed, 2 May 2007 17:13:32 +0200 Subject: Fix buffer object list freeing. --- libdrm/xf86drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdrm/xf86drm.c') diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index f07e853f..09c4f298 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -2499,7 +2499,7 @@ void drmBOFreeList(drmBOList *list) DRMLISTDEL(l); node = DRMLISTENTRY(drmBONode, l, head); free(node); - l = list->free.next; + l = list->list.next; list->numCurrent--; list->numOnList--; } -- cgit v1.2.3 From 963ed9910ab59af23c66f4a8fafb7879f5140d97 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 8 May 2007 17:51:21 +1000 Subject: libdrm: fix typo on ttm fence interface --- libdrm/xf86drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdrm/xf86drm.c') diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 09c4f298..78efcf2a 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -2888,7 +2888,7 @@ int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle) req->handle = buf->handle; req->mask = flags; req->arg_handle = fenceHandle; - req->op = drm_bo_validate; + req->op = drm_bo_fence; ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- cgit v1.2.3