X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=linux-core%2Fxgi_drv.h;h=5ad3ddb3587dddfc028aa154a950072b67b90ff9;hb=226c97e3b772f2f4bf09085374cd931b83dea2b0;hp=d9a94f5fd3cc2a89edba9c2c1eb0584136ac86af;hpb=7f99fd5d7aa1f0d2463907d9d8c483b6249ac831;p=platform%2Fupstream%2Flibdrm.git

diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index d9a94f5..5ad3ddb 100644
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -35,11 +35,11 @@
 
 #define DRIVER_NAME		"xgi"
 #define DRIVER_DESC		"XGI XP5 / XP10 / XG47"
-#define DRIVER_DATE		"20071003"
+#define DRIVER_DATE		"20080612"
 
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	3
+#define DRIVER_MINOR		2
+#define DRIVER_PATCHLEVEL	0
 
 #include "xgi_cmdlist.h"
 #include "xgi_drm.h"
@@ -64,7 +64,7 @@ struct xgi_info {
 	struct drm_map *fb_map;
 
 	/* look up table parameters */
-	struct ati_pcigart_info gart_info;
+	struct drm_ati_pcigart_info gart_info;
 	unsigned int lutPageSize;
 
 	struct drm_sman sman;
@@ -74,6 +74,7 @@ struct xgi_info {
 	struct xgi_cmdring_info cmdring;
 
 	DRM_SPINTYPE fence_lock;
+	wait_queue_head_t fence_queue;
 	unsigned complete_sequence;
 	unsigned next_sequence;
 };
@@ -86,7 +87,7 @@ extern int xgi_fb_heap_init(struct xgi_info * info);
 extern int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
 	struct drm_file * filp);
 
-extern int xgi_free(struct xgi_info * info, unsigned long index,
+extern int xgi_free(struct xgi_info * info, unsigned int index,
 	struct drm_file * filp);
 
 extern int xgi_pcie_heap_init(struct xgi_info * info);
@@ -98,12 +99,24 @@ extern void xgi_disable_mmio(struct xgi_info * info);
 extern void xgi_enable_ge(struct xgi_info * info);
 extern void xgi_disable_ge(struct xgi_info * info);
 
+/* TTM-style fences.
+ */
+#ifdef XGI_HAVE_FENCE
 extern void xgi_poke_flush(struct drm_device * dev, uint32_t class);
 extern int xgi_fence_emit_sequence(struct drm_device * dev, uint32_t class,
 	uint32_t flags, uint32_t * sequence, uint32_t * native_type);
 extern void xgi_fence_handler(struct drm_device * dev);
 extern int xgi_fence_has_irq(struct drm_device *dev, uint32_t class,
 	uint32_t flags);
+#endif /* XGI_HAVE_FENCE */
+
+
+/* Non-TTM-style fences.
+ */
+extern int xgi_set_fence_ioctl(struct drm_device * dev, void * data,
+	struct drm_file * filp);
+extern int xgi_wait_fence_ioctl(struct drm_device * dev, void * data,
+	struct drm_file * filp);
 
 extern int xgi_alloc_ioctl(struct drm_device * dev, void * data,
 	struct drm_file * filp);