Hi,

Once the 915 super ioctl is merged, the patch attached removes the unused interfaces left behind...

Are any of these worth saving?

Dave.

--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied at skynet.ie
Linux kernel - DRI, VAX / pam_smb / ILUG
From 5bb96b72c503953ae83e5fc12a4864f338189186 Mon Sep 17 00:00:00 2001
From: Dave Airlie <[EMAIL PROTECTED]>
Date: Tue, 9 Oct 2007 15:45:06 +1000
Subject: [PATCH] ttm: remove unused interface post-superioctl for 915

---
 libdrm/xf86drm.c         |  400 +---------------------------------------------
 libdrm/xf86mm.h          |   40 +-----
 linux-core/drm_bo.c      |   76 ---------
 linux-core/drm_drv.c     |    2 -
 linux-core/drm_fence.c   |   39 -----
 linux-core/drm_objects.h |    3 -
 shared-core/drm.h        |   12 --
 7 files changed, 2 insertions(+), 570 deletions(-)

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index dc18d6f..1b9c889 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2364,32 +2364,7 @@ int drmFenceCreate(int fd, unsigned flags, int 
fence_class, unsigned type,
     fence->signaled = 0;
     return 0;
 }
-
-/*
- * Valid flags are 
- * DRM_FENCE_FLAG_SHAREABLE
- * DRM_FENCE_MASK_DRIVER
- */
-
-int drmFenceBuffers(int fd, unsigned flags, uint32_t fence_class, drmFence 
*fence)
-{
-    drm_fence_arg_t arg;
-
-    memset(&arg, 0, sizeof(arg));
-    arg.flags = flags;
-    arg.fence_class = fence_class;
-
-    if (ioctl(fd, DRM_IOCTL_FENCE_BUFFERS, &arg))
-       return -errno;
-    fence->handle = arg.handle;
-    fence->fence_class = arg.fence_class;
-    fence->type = arg.type;
-    fence->flags = arg.flags;
-    fence->sequence = arg.sequence;
-    fence->signaled = 0;
-    return 0;
-}
-    
+ 
 int drmFenceDestroy(int fd, const drmFence *fence)
 {
     drm_fence_arg_t arg;
@@ -2541,144 +2516,6 @@ int drmFenceWait(int fd, unsigned flags, drmFence 
*fence, unsigned flush_type)
     return 0;
 }    
 
-static int drmAdjustListNodes(drmBOList *list)
-{
-    drmBONode *node;
-    drmMMListHead *l;
-    int ret = 0;
-
-    while(list->numCurrent < list->numTarget) {
-       node = (drmBONode *) malloc(sizeof(*node));
-       if (!node) {
-           ret = -ENOMEM;
-           break;
-       }
-       list->numCurrent++;
-       DRMLISTADD(&node->head, &list->free);
-    }
-
-    while(list->numCurrent > list->numTarget) {
-       l = list->free.next;
-       if (l == &list->free)
-           break;
-       DRMLISTDEL(l);
-       node = DRMLISTENTRY(drmBONode, l, head);
-       free(node);
-       list->numCurrent--;
-    }
-    return ret;
-}
-
-void drmBOFreeList(drmBOList *list)
-{
-    drmBONode *node;
-    drmMMListHead *l;
-
-    l = list->list.next;
-    while(l != &list->list) {
-       DRMLISTDEL(l);
-       node = DRMLISTENTRY(drmBONode, l, head);
-       free(node);
-       l = list->list.next;
-       list->numCurrent--;
-       list->numOnList--;
-    }
-
-    l = list->free.next;
-    while(l != &list->free) {
-       DRMLISTDEL(l);
-       node = DRMLISTENTRY(drmBONode, l, head);
-       free(node);
-       l = list->free.next;
-       list->numCurrent--;
-    }
-}
-       
-int drmBOResetList(drmBOList *list)
-{
-    drmMMListHead *l;
-    int ret;
-
-    ret = drmAdjustListNodes(list);
-    if (ret)
-       return ret;
-
-    l = list->list.next;
-    while (l != &list->list) {
-       DRMLISTDEL(l);
-       DRMLISTADD(l, &list->free);
-       list->numOnList--;
-       l = list->list.next;
-    }
-    return drmAdjustListNodes(list);
-}
-       
-static drmBONode *drmAddListItem(drmBOList *list, drmBO *item, 
-                                unsigned long arg0,
-                                unsigned long arg1)
-{
-    drmBONode *node;
-    drmMMListHead *l;
-
-    l = list->free.next;
-    if (l == &list->free) {
-       node = (drmBONode *) malloc(sizeof(*node));
-       if (!node) {
-           return NULL;
-       }
-       list->numCurrent++;
-    }
-    else {
-       DRMLISTDEL(l);
-       node = DRMLISTENTRY(drmBONode, l, head);
-    }
-    node->buf = item;
-    node->arg0 = arg0;
-    node->arg1 = arg1;
-    DRMLISTADD(&node->head, &list->list);
-    list->numOnList++;
-    return node;
-}
-       
-void *drmBOListIterator(drmBOList *list)
-{
-    void *ret = list->list.next;
-
-    if (ret == &list->list)
-       return NULL;
-    return ret;
-}
-
-void *drmBOListNext(drmBOList *list, void *iterator)
-{
-    void *ret;
-
-    drmMMListHead *l = (drmMMListHead *) iterator;
-    ret = l->next;
-    if (ret == &list->list)
-       return NULL;
-    return ret;
-}
-
-drmBO *drmBOListBuf(void *iterator)
-{
-    drmBONode *node;
-    drmMMListHead *l = (drmMMListHead *) iterator;
-    node = DRMLISTENTRY(drmBONode, l, head);
-    return node->buf;
-}
-
-
-int drmBOCreateList(int numTarget, drmBOList *list)
-{
-    DRMINITLISTHEAD(&list->list);
-    DRMINITLISTHEAD(&list->free);
-    list->numTarget = numTarget;
-    list->numCurrent = 0;
-    list->numOnList = 0;
-    return drmAdjustListNodes(list);
-}
-
 static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
 {
     buf->handle = rep->handle;
@@ -2881,62 +2718,6 @@ int drmBOUnmap(int fd, drmBO *buf)
     return 0;
 }
 
-int drmBOValidate(int fd, drmBO *buf, uint32_t fence_class,
-                 uint64_t flags, uint64_t mask,
-                 unsigned hint)
-{
-    struct drm_bo_op_arg arg;
-    struct drm_bo_op_req *req = &arg.d.req;
-    struct drm_bo_arg_rep *rep = &arg.d.rep;
-    int ret = 0;
-
-    memset(&arg, 0, sizeof(arg));
-    req->bo_req.handle = buf->handle;
-    req->bo_req.flags = flags;
-    req->bo_req.mask = mask;
-    req->bo_req.hint = hint;
-    req->bo_req.fence_class = fence_class;
-    req->op = drm_bo_validate;
-
-    do{
-       ret = ioctl(fd, DRM_IOCTL_BO_OP, &arg);
-    } while (ret && errno == EAGAIN);
-
-    if (ret) 
-       return -errno;
-    if (!arg.handled)
-       return -EFAULT;
-    if (rep->ret)
-       return rep->ret;
-
-    drmBOCopyReply(&rep->bo_info, buf);
-    return 0;
-}
-           
-
-int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle)
-{
-    struct drm_bo_op_arg arg;
-    struct drm_bo_op_req *req = &arg.d.req;
-    struct drm_bo_arg_rep *rep = &arg.d.rep;
-    int ret = 0;
-
-    memset(&arg, 0, sizeof(arg));
-    req->bo_req.handle = buf->handle;
-    req->bo_req.flags = flags;
-    req->arg_handle = fenceHandle;
-    req->op = drm_bo_fence;
-
-    ret = ioctl(fd, DRM_IOCTL_BO_OP, &arg);
-    if (ret) 
-       return -errno;
-    if (!arg.handled)
-       return -EFAULT;
-    if (rep->ret)
-       return rep->ret;
-    return 0;
-}
-
 int drmBOInfo(int fd, drmBO *buf)
 {
     struct drm_bo_reference_info_arg arg;
@@ -3019,185 +2800,6 @@ int drmBOBusy(int fd, drmBO *buf, int *busy)
     }
 }
     
-int drmAddValidateItem(drmBOList *list, drmBO *buf, unsigned flags, 
-                      unsigned mask,
-                      int *newItem)
-{
-    drmBONode *node, *cur;
-    drmMMListHead *l;
-
-    *newItem = 0;
-    cur = NULL;
-
-    for (l = list->list.next; l != &list->list; l = l->next) {
-       node = DRMLISTENTRY(drmBONode, l, head);
-       if (node->buf == buf) {
-           cur = node;
-           break;
-       }
-    }
-    if (!cur) {
-       cur = drmAddListItem(list, buf, flags, mask);
-       if (!cur) {
-           drmMsg("Out of memory creating validate list node.\n");
-           return -ENOMEM;
-       }
-       *newItem = 1;
-       cur->arg0 = flags;
-       cur->arg1 = mask;
-    }
-    else {
-       unsigned memMask = (cur->arg1 | mask) & DRM_BO_MASK_MEM;
-       unsigned memFlags = cur->arg0 & flags & memMask;
-       
-       if (!memFlags) {
-           drmMsg("Incompatible memory location requests "
-                  "on validate list.\n");
-           drmMsg("Previous flag: 0x%08lx, mask: 0x%08lx\n",
-                  cur->arg0, cur->arg1);
-           drmMsg("Current flag: 0x%08lx, mask: 0x%08lx\n",
-                  flags, mask);
-           return -EINVAL;
-       }
-       if (mask & cur->arg1 & ~DRM_BO_MASK_MEM  & (cur->arg0 ^ flags)) {
-           drmMsg("Incompatible buffer flag requests "
-                  "on validate list.\n");
-           drmMsg("Previous flag: 0x%08lx, mask: 0x%08lx\n",
-                  cur->arg0, cur->arg1);
-           drmMsg("Current flag: 0x%08lx, mask: 0x%08lx\n",
-                  flags, mask);
-           return -EINVAL;
-       }
-       cur->arg1 |= mask;
-       cur->arg0 = memFlags | ((cur->arg0 | flags) & 
-                               cur->arg1 & ~DRM_BO_MASK_MEM);  
-    }
-    return 0;
-}
-
-
-int drmBOValidateList(int fd, drmBOList *list)
-{
-    drmBONode *node;
-    drmMMListHead *l;
-    struct drm_bo_op_arg *arg, *first;
-    struct drm_bo_op_req *req;
-    struct drm_bo_arg_rep *rep;
-    uint64_t *prevNext = NULL;
-    drmBO *buf;
-    int ret;
-
-    first = NULL;
-
-    for (l = list->list.next; l != &list->list; l = l->next) {
-        node = DRMLISTENTRY(drmBONode, l, head);
-
-        arg = &node->bo_arg;
-        req = &arg->d.req;
-
-        if (!first)
-            first = arg;
-
-       if (prevNext)
-           *prevNext = (unsigned long) arg;
-
-       memset(arg, 0, sizeof(*arg));
-       prevNext = &arg->next;
-       req->bo_req.handle = node->buf->handle;
-       req->op = drm_bo_validate;
-       req->bo_req.flags = node->arg0;
-       req->bo_req.hint = 0;
-       req->bo_req.mask = node->arg1;
-       req->bo_req.fence_class = 0; /* Backwards compat. */
-    }
-
-    if (!first)
-       return 0;
-
-    do{
-       ret = ioctl(fd, DRM_IOCTL_BO_OP, first);
-    } while (ret && errno == EAGAIN);
-
-    if (ret)
-       return -errno;
-
-    for (l = list->list.next; l != &list->list; l = l->next) {
-       node = DRMLISTENTRY(drmBONode, l, head);
-       arg = &node->bo_arg;
-       rep = &arg->d.rep;
-      
-       if (!arg->handled) {
-           drmMsg("Unhandled request\n");
-           return -EFAULT;
-       }
-       if (rep->ret)
-           return rep->ret;
-       
-       buf = node->buf;
-       drmBOCopyReply(&rep->bo_info, buf);
-    }
-    
-    return 0;
-}
-         
-int drmBOFenceList(int fd, drmBOList *list, unsigned fenceHandle)
-{
-    drmBONode *node;
-    drmMMListHead *l;
-    struct drm_bo_op_arg *arg, *first;
-    struct drm_bo_op_req *req;
-    struct drm_bo_arg_rep *rep;
-    uint64_t *prevNext = NULL;
-    drmBO *buf;
-    unsigned fence_flags;
-    int ret;
-
-    first = NULL;
-
-    for (l = list->list.next; l != &list->list; l = l->next) {
-        node = DRMLISTENTRY(drmBONode, l, head);
-       
-       arg = &node->bo_arg;
-       req = &arg->d.req;
-
-       if (!first)
-           first = arg;
-
-       if (prevNext)
-           *prevNext = (unsigned long) arg;
-
-       memset(arg, 0, sizeof(*arg));
-       prevNext = &arg->next;
-       req->bo_req.handle = node->buf->handle;
-       req->op = drm_bo_fence;
-       req->bo_req.mask = node->arg0;
-       req->arg_handle = fenceHandle;
-    }
-  
-    if (!first) 
-       return 0;
-
-    ret = ioctl(fd, DRM_IOCTL_BO_OP, first);
-
-    if (ret)
-       return -errno;
-  
-    for (l = list->list.next; l != &list->list; l = l->next) {
-       node = DRMLISTENTRY(drmBONode, l, head);
-
-       arg = &node->bo_arg;
-       rep = &arg->d.rep;
-
-       if (!arg->handled)
-           return -EFAULT;
-       if (rep->ret)
-           return rep->ret;
-       drmBOCopyReply(&rep->bo_info, node->buf);
-    }
-
-    return 0;
-}
-
 int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize,
              unsigned memType)
 {
diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h
index cacd13a..65fe2d1 100644
--- a/libdrm/xf86mm.h
+++ b/libdrm/xf86mm.h
@@ -37,7 +37,7 @@
  * be protected using an external mutex.
  *
  * Note: Don't protect the following functions, as it may lead to deadlocks:
- * drmBOUnmap(), drmFenceBuffers().
+ * drmBOUnmap()
  * The kernel is synchronizing and refcounting buffer maps. 
  * User space only needs to refcount object usage within the same application.
  */
@@ -127,24 +127,6 @@ typedef struct _drmBO
     unsigned pad[8];     /* for future expansion */
 } drmBO;
 
-typedef struct _drmBONode
-{
-    drmMMListHead head;
-    drmBO *buf;
-    struct drm_bo_op_arg bo_arg;
-    unsigned long arg0;
-    unsigned long arg1;
-} drmBONode;
-
-typedef struct _drmBOList {
-    unsigned numTarget;
-    unsigned numCurrent;
-    unsigned numOnList;
-    drmMMListHead list;
-    drmMMListHead free;
-} drmBOList;
-
-
 /*
  * Fence functions.
  */
@@ -161,19 +143,6 @@ extern int drmFenceWait(int fd, unsigned flags, drmFence 
*fence,
                         unsigned flush_type);
 extern int drmFenceEmit(int fd, unsigned flags, drmFence *fence, 
                         unsigned emit_type);
-extern int drmFenceBuffers(int fd, unsigned flags, uint32_t fence_class, 
drmFence *fence);
-
-
-/*
- * Buffer object list functions.
- */
-
-extern void drmBOFreeList(drmBOList *list);
-extern int drmBOResetList(drmBOList *list);
-extern void *drmBOListIterator(drmBOList *list);
-extern void *drmBOListNext(drmBOList *list, void *iterator);
-extern drmBO *drmBOListBuf(void *iterator);
-extern int drmBOCreateList(int numTarget, drmBOList *list);
 
 /*
  * Buffer object functions.
@@ -189,18 +158,11 @@ extern int drmBOUnReference(int fd, drmBO *buf);
 extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
                    void **address);
 extern int drmBOUnmap(int fd, drmBO *buf);
-extern int drmBOValidate(int fd, drmBO *buf, uint32_t fence_class, uint64_t 
flags,
-                        uint64_t mask, unsigned hint);
 
 extern int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned 
fenceHandle);
 extern int drmBOInfo(int fd, drmBO *buf);
 extern int drmBOBusy(int fd, drmBO *buf, int *busy);
 
-extern int drmAddValidateItem(drmBOList *list, drmBO *buf, unsigned flags,
-                      unsigned mask,
-                      int *newItem);
-extern int drmBOValidateList(int fd, drmBOList *list);
-extern int drmBOFenceList(int fd, drmBOList *list, unsigned fenceHandle);
 extern int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint);
 int drmBOSetPin(int fd, drmBO *buf, int pin);
 
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 27bca52..782ce61 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1760,82 +1760,6 @@ static int drm_bo_lock_test(struct drm_device * dev, 
struct drm_file *file_priv)
        return 0;
 }
 
-int drm_bo_op_ioctl(struct drm_device *dev, void *data, struct drm_file 
*file_priv)
-{
-       struct drm_bo_op_arg curarg;
-       struct drm_bo_op_arg *arg = data;
-       struct drm_bo_op_req *req = &arg->d.req;
-       struct drm_bo_info_rep rep;
-       unsigned long next = 0;
-       void __user *curuserarg = NULL;
-       int ret;
-
-       DRM_DEBUG("drm_bo_op_ioctl\n");
-
-       if (!dev->bm.initialized) {
-               DRM_ERROR("Buffer object manager is not initialized.\n");
-               return -EINVAL;
-       }
-
-       do {
-               if (next != 0) {
-                       curuserarg = (void __user *)next;
-                       if (copy_from_user(&curarg, curuserarg,
-                                          sizeof(curarg)) != 0)
-                               return -EFAULT;
-                       arg = &curarg;
-               }
-
-               if (arg->handled) {
-                       next = arg->next;
-                       continue;
-               }
-               req = &arg->d.req;
-               ret = 0;
-               switch (req->op) {
-               case drm_bo_validate:
-                       ret = drm_bo_lock_test(dev, file_priv);
-                       if (ret)
-                               break;
-                       ret = drm_bo_handle_validate(file_priv, 
req->bo_req.handle,
-                                                    req->bo_req.fence_class,
-                                                    req->bo_req.flags,
-                                                    req->bo_req.mask,
-                                                    req->bo_req.hint,
-                                                    &rep, NULL);
-                       break;
-               case drm_bo_fence:
-                       ret = -EINVAL;
-                       DRM_ERROR("Function is not implemented yet.\n");
-                       break;
-               case drm_bo_ref_fence:
-                       ret = -EINVAL;
-                       DRM_ERROR("Function is not implemented yet.\n");
-                       break;
-               default:
-                       ret = -EINVAL;
-               }
-               next = arg->next;
-
-               /*
-                * A signal interrupted us. Make sure the ioctl is restartable.
-                */
-
-               if (ret == -EAGAIN)
-                       return -EAGAIN;
-
-               arg->handled = 1;
-               arg->d.rep.ret = ret;
-               arg->d.rep.bo_info = rep;
-               if (arg != data) {
-                       if (copy_to_user(curuserarg, &curarg,
-                                        sizeof(curarg)) != 0)
-                               return -EFAULT;
-               }
-       } while (next != 0);
-       return 0;
-}
-
 int drm_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file 
*file_priv)
 {
        struct drm_bo_create_arg *arg = data;
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index a09fa96..e3fd0b0 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -136,7 +136,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
        DRM_IOCTL_DEF(DRM_IOCTL_FENCE_FLUSH, drm_fence_flush_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_FENCE_WAIT, drm_fence_wait_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_FENCE_EMIT, drm_fence_emit_ioctl, DRM_AUTH),
-       DRM_IOCTL_DEF(DRM_IOCTL_FENCE_BUFFERS, drm_fence_buffers_ioctl, 
DRM_AUTH),
 
        DRM_IOCTL_DEF(DRM_IOCTL_BO_CREATE, drm_bo_create_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_DESTROY, drm_bo_destroy_ioctl, DRM_AUTH),
@@ -144,7 +143,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
        DRM_IOCTL_DEF(DRM_IOCTL_BO_UNMAP, drm_bo_unmap_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_REFERENCE, drm_bo_reference_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_UNREFERENCE, drm_bo_unreference_ioctl, 
DRM_AUTH),
-       DRM_IOCTL_DEF(DRM_IOCTL_BO_OP, drm_bo_op_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_INFO, drm_bo_info_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_WAIT_IDLE, drm_bo_wait_idle_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_BO_SET_PIN, drm_bo_set_pin_ioctl, DRM_AUTH | 
DRM_MASTER | DRM_ROOT_ONLY),
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index c25ff3b..6807b54 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -833,42 +833,3 @@ int drm_fence_emit_ioctl(struct drm_device *dev, void 
*data, struct drm_file *fi
 
        return ret;
 }
-
-int drm_fence_buffers_ioctl(struct drm_device *dev, void *data, struct 
drm_file *file_priv)
-{
-       int ret;
-       struct drm_fence_manager *fm = &dev->fm;
-       struct drm_fence_arg *arg = data;
-       struct drm_fence_object *fence;
-       ret = 0;
-
-       if (!fm->initialized) {
-               DRM_ERROR("The DRM driver does not support fencing.\n");
-               return -EINVAL;
-       }
-
-       if (!dev->bm.initialized) {
-               DRM_ERROR("Buffer object manager is not initialized\n");
-               return -EINVAL;
-       }
-       LOCK_TEST_WITH_RETURN(dev, file_priv);
-       ret = drm_fence_buffer_objects(dev, NULL, arg->flags,
-                                      NULL, &fence);
-       if (ret)
-               return ret;
-
-       if (!(arg->flags & DRM_FENCE_FLAG_NO_USER)) {
-               ret = drm_fence_add_user_object(file_priv, fence,
-                                               arg->flags &
-                                               DRM_FENCE_FLAG_SHAREABLE);
-               if (ret)
-                       return ret;
-       }
-
-       arg->handle = fence->base.hash.key;
-
-       drm_fence_fill_arg(fence, arg);
-       drm_fence_usage_deref_unlocked(&fence);
-
-       return ret;
-}
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h
index 9748baa..ba20016 100644
--- a/linux-core/drm_objects.h
+++ b/linux-core/drm_objects.h
@@ -241,8 +241,6 @@ extern int drm_fence_wait_ioctl(struct drm_device *dev, 
void *data,
                                struct drm_file *file_priv);
 extern int drm_fence_emit_ioctl(struct drm_device *dev, void *data,
                                struct drm_file *file_priv);
-extern int drm_fence_buffers_ioctl(struct drm_device *dev, void *data,
-                                  struct drm_file *file_priv);
 /**************************************************
  *TTMs
  */
@@ -474,7 +472,6 @@ extern int drm_bo_reference_ioctl(struct drm_device *dev, 
void *data, struct drm
 extern int drm_bo_unreference_ioctl(struct drm_device *dev, void *data, struct 
drm_file *file_priv);
 extern int drm_bo_wait_idle_ioctl(struct drm_device *dev, void *data, struct 
drm_file *file_priv);
 extern int drm_bo_info_ioctl(struct drm_device *dev, void *data, struct 
drm_file *file_priv);
-extern int drm_bo_op_ioctl(struct drm_device *dev, void *data, struct drm_file 
*file_priv);
 int drm_bo_set_pin_ioctl(struct drm_device *dev, void *data, struct drm_file 
*file_priv);
 
 extern int drm_mm_init_ioctl(struct drm_device *dev, void *data, struct 
drm_file *file_priv);
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 1929234..dcdaf55 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -857,16 +857,6 @@ struct drm_bo_map_wait_idle_arg {
        } d;
 };
 
-struct drm_bo_op_arg {
-       uint64_t next;
-       union {
-               struct drm_bo_op_req req;
-               struct drm_bo_arg_rep rep;
-       } d;
-       int handled;
-       unsigned int pad64;
-};
-
 struct drm_bo_set_pin_arg {
        union {
                struct drm_bo_set_pin_req req;
@@ -978,7 +968,6 @@ struct drm_mm_init_arg {
 #define DRM_IOCTL_FENCE_FLUSH           DRM_IOWR(0xc9, struct drm_fence_arg)
 #define DRM_IOCTL_FENCE_WAIT            DRM_IOWR(0xca, struct drm_fence_arg)
 #define DRM_IOCTL_FENCE_EMIT            DRM_IOWR(0xcb, struct drm_fence_arg)
-#define DRM_IOCTL_FENCE_BUFFERS         DRM_IOWR(0xcc, struct drm_fence_arg)
 
 #define DRM_IOCTL_BO_CREATE             DRM_IOWR(0xcd, struct 
drm_bo_create_arg)
 #define DRM_IOCTL_BO_DESTROY            DRM_IOWR(0xce, struct 
drm_bo_handle_arg)
@@ -986,7 +975,6 @@ struct drm_mm_init_arg {
 #define DRM_IOCTL_BO_UNMAP              DRM_IOWR(0xd0, struct 
drm_bo_handle_arg)
 #define DRM_IOCTL_BO_REFERENCE          DRM_IOWR(0xd1, struct 
drm_bo_reference_info_arg)
 #define DRM_IOCTL_BO_UNREFERENCE        DRM_IOWR(0xd2, struct 
drm_bo_handle_arg)
-#define DRM_IOCTL_BO_OP                 DRM_IOWR(0xd3, struct drm_bo_op_arg)
 #define DRM_IOCTL_BO_INFO               DRM_IOWR(0xd4, struct 
drm_bo_reference_info_arg)
 #define DRM_IOCTL_BO_WAIT_IDLE          DRM_IOWR(0xd5, struct 
drm_bo_map_wait_idle_arg)
 #define DRM_IOCTL_BO_SET_PIN           DRM_IOWR(0xd6, struct 
drm_bo_set_pin_arg)
-- 
1.4.4.2

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to