Merge branch 'master' into modesetting-gem

[platform/upstream/libdrm.git] / libdrm / dri_bufmgr.h

diff --git a/libdrm/dri_bufmgr.h b/libdrm/dri_bufmgr.h
index a5ae6c0..2005bdc 100644 (file)
--- a/libdrm/dri_bufmgr.h
+++ b/libdrm/dri_bufmgr.h
@@ -58,6 +58,10 @@ struct _dri_bo {
    void *virtual;
    /** Buffer manager context associated with this buffer object */
    dri_bufmgr *bufmgr;
+   /**
+    * MM-specific handle for accessing object
+    */
+   int handle;
 };
 
 /**
@@ -146,7 +150,7 @@ struct _dri_bufmgr {
 
    void (*post_submit)(dri_bo *batch_buf);
 
-   int (*check_aperture_space)(dri_bo *bo);
+   int (*check_aperture_space)(dri_bo **bo_array, int count);
    int debug; /**< Enables verbose debugging printouts */
 };
 
@@ -169,6 +173,6 @@ void dri_bufmgr_destroy(dri_bufmgr *bufmgr);
 void *dri_process_relocs(dri_bo *batch_buf);
 void dri_post_process_relocs(dri_bo *batch_buf);
 void dri_post_submit(dri_bo *batch_buf);
-int dri_bufmgr_check_aperture_space(dri_bo *bo);
+int dri_bufmgr_check_aperture_space(dri_bo **bo_array, int count);
 
 #endif