i915 make relocs use copy from user

[android-x86/external-libdrm.git] / shared-core / mga_drm.h

diff --git a/shared-core/mga_drm.h b/shared-core/mga_drm.h
index 5b8f156..c03d322 100644 (file)
--- a/shared-core/mga_drm.h
+++ b/shared-core/mga_drm.h
@@ -181,7 +181,7 @@ typedef struct _drm_mga_sarea {
 
        /* The current cliprects, or a subset thereof.
         */
-       drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
+       struct drm_clip_rect boxes[MGA_NR_SAREA_CLIPRECTS];
        unsigned int nbox;
 
        /* Information about the most recently used 3d drawable.  The
@@ -202,7 +202,7 @@ typedef struct _drm_mga_sarea {
        unsigned int exported_nback;
        int exported_back_x, exported_front_x, exported_w;
        int exported_back_y, exported_front_y, exported_h;
-       drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+       struct drm_clip_rect exported_boxes[MGA_NR_SAREA_CLIPRECTS];
 
        /* Counters for aging textures and for client-side throttling.
         */
@@ -216,7 +216,7 @@ typedef struct _drm_mga_sarea {
 
        /* LRU lists for texture memory in agp space and on the card.
         */
-       drm_tex_region_t texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1];
+       struct drm_tex_region texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1];
        unsigned int texAge[MGA_NR_TEX_HEAPS];
 
        /* Mechanism to validate card state.
@@ -302,24 +302,24 @@ typedef struct drm_mga_init {
 typedef struct drm_mga_dma_bootstrap {
        /**
         * \name AGP texture region
-        * 
+        *
         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, these fields will
         * be filled in with the actual AGP texture settings.
-        * 
+        *
         * \warning
         * If these fields are non-zero, but dma_mga_dma_bootstrap::agp_mode
         * is zero, it means that PCI memory (most likely through the use of
         * an IOMMU) is being used for "AGP" textures.
         */
        /*@{*/
-       drm_handle_t texture_handle;  /**< Handle used to map AGP textures. */
+       unsigned long texture_handle;  /**< Handle used to map AGP textures. */
        uint32_t     texture_size;    /**< Size of the AGP texture region. */
        /*@}*/
 
 
        /**
         * Requested size of the primary DMA region.
-        * 
+        *
         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
         * filled in with the actual AGP mode.  If AGP was not available
         */
@@ -328,18 +328,18 @@ typedef struct drm_mga_dma_bootstrap {
 
        /**
         * Requested number of secondary DMA buffers.
-        * 
+        *
         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
         * filled in with the actual number of secondary DMA buffers
         * allocated.  Particularly when PCI DMA is used, this may be
         * (subtantially) less than the number requested.
         */
        uint32_t secondary_bin_count;
-       
-       
+
+
        /**
         * Requested size of each secondary DMA buffer.
-        * 
+        *
         * While the kernel \b is free to reduce
         * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
         * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
@@ -352,7 +352,7 @@ typedef struct drm_mga_dma_bootstrap {
         * \c AGPSTAT2_2X, and \c AGPSTAT2_4X are supported.  If this value is
         * zero, it means that PCI DMA should be used, even if AGP is
         * possible.
-        * 
+        *
         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
         * filled in with the actual AGP mode.  If AGP was not available
         * (i.e., PCI DMA was used), this value will be zero.