1 files changed, 33 insertions, 19 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
index f30a3f1fb..399e38b7f 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
@@ -36,41 +36,55 @@
  * the kernel include file as well (r128_drm.h)
  */
 
+#define DRM_R128_FRONT		0x1
+#define DRM_R128_BACK		0x2
+#define DRM_R128_DEPTH		0x4
+
 typedef struct {
    int sarea_priv_offset;
    int is_pci;
    int cce_mode;
-   int cce_fifo_size;
    int cce_secure;
    int ring_size;
    int usec_timeout;
 
-   int fb_offset;
-   int agp_ring_offset;
-   int agp_read_ptr_offset;
-   int agp_vertbufs_offset;
-   int agp_indbufs_offset;
-   int agp_textures_offset;
-   int mmio_offset;
+   unsigned int fb_bpp;
+   unsigned int front_offset, front_pitch;
+   unsigned int front_x, front_y;
+   unsigned int back_offset, back_pitch;
+   unsigned int back_x, back_y;
+   unsigned int depth_bpp;
+   unsigned int depth_offset, depth_pitch;
+   unsigned int depth_x, depth_y;
+
+   unsigned int fb_offset;
+   unsigned int mmio_offset;
+   unsigned int ring_offset;
+   unsigned int ring_rptr_offset;
+   unsigned int vertex_buffers_offset;
+   unsigned int indirect_buffers_offset;
+   unsigned int agp_textures_offset;
 } drmR128Init;
 
 extern int drmR128InitCCE( int fd, drmR128Init *info );
 extern int drmR128CleanupCCE( int fd );
 
-extern int drmR128EngineReset( int fd );
-extern int drmR128EngineFlush( int fd );
-extern int drmR128WaitForIdle( int fd );
-extern int drmR128SubmitPacket( int fd, void *buffer,
-				int *count, int flags );
+extern int drmR128StartCCE( int fd );
+extern int drmR128ResetCCE( int fd );
+extern int drmR128StopCCE( int fd );
+extern int drmR128WaitForIdleCCE( int fd );
 
-#if 0
-extern int drmR128GetVertexBuffers( int fd, int count,
-				    int *indices, int *sizes );
-extern int drmR128FlushVertexBuffers( int fd, int count,
-				      int *indices, int *sizes );
-#endif
+extern int drmR128EngineReset( int fd );
 
+extern int drmR128SwapBuffers( int fd );
+extern int drmR128Clear( int fd, unsigned int flags,
+			 int x, int y, int w, int h,
+			 unsigned int clear_color, unsigned int clear_depth,
+			 unsigned int color_mask, unsigned int depth_mask );
 extern int drmR128VertexBuffer( int fd, int *index, int used,
 				int send, int discard, int request );
 
+extern int drmR128SubmitPacket( int fd, void *buffer,
+				int *count, int flags );
+
 #endif