#include "drmP.h"
#include "drm.h"
+#include "drm_sman.h"
#define DRIVER_AUTHOR "Andrea Zhang <andrea_zhang@macrosynergy.com>"
#define DRIVER_NAME "xgi"
#define DRIVER_DESC "XGI XP5 / XP10 / XG47"
-#define DRIVER_DATE "20070723"
+#define DRIVER_DATE "20080612"
-#define DRIVER_MAJOR 0
-#define DRIVER_MINOR 10
+#define DRIVER_MAJOR 1
+#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 0
#include "xgi_cmdlist.h"
unsigned int size;
};
-struct xgi_mem_block {
- struct list_head list;
- unsigned long offset;
- unsigned long size;
- DRMFILE filp;
-
- unsigned int owner;
-};
-
-struct xgi_mem_heap {
- struct list_head free_list;
- struct list_head used_list;
- struct list_head sort_list;
- unsigned long max_freesize;
-
- bool initialized;
-};
-
struct xgi_info {
struct drm_device *dev;
struct drm_map *fb_map;
/* look up table parameters */
- struct drm_dma_handle *lut_handle;
+ struct drm_ati_pcigart_info gart_info;
unsigned int lutPageSize;
- struct xgi_mem_heap fb_heap;
- struct xgi_mem_heap pcie_heap;
-
- struct semaphore fb_sem;
- struct semaphore pcie_sem;
+ struct drm_sman sman;
+ bool fb_heap_initialized;
+ bool pcie_heap_initialized;
struct xgi_cmdring_info cmdring;
-};
-enum PcieOwner {
- PCIE_2D = 0,
- /*
- PCIE_3D should not begin with 1,
- 2D alloc pcie memory will use owner 1.
- */
- PCIE_3D = 11, /*vetex buf */
- PCIE_3D_CMDLIST = 12,
- PCIE_3D_SCRATCHPAD = 13,
- PCIE_3D_TEXTURE = 14,
- PCIE_INVALID = 0x7fffffff
+ DRM_SPINTYPE fence_lock;
+ wait_queue_head_t fence_queue;
+ unsigned complete_sequence;
+ unsigned next_sequence;
};
-
-extern struct kmem_cache *xgi_mem_block_cache;
-extern struct xgi_mem_block *xgi_mem_alloc(struct xgi_mem_heap * heap,
- unsigned long size, enum PcieOwner owner);
-extern int xgi_mem_free(struct xgi_mem_heap * heap, unsigned long offset,
- DRMFILE filp);
-extern int xgi_mem_heap_init(struct xgi_mem_heap * heap, unsigned int start,
- unsigned int end);
-extern void xgi_mem_heap_cleanup(struct xgi_mem_heap * heap);
+extern long xgi_compat_ioctl(struct file *filp, unsigned int cmd,
+ unsigned long arg);
extern int xgi_fb_heap_init(struct xgi_info * info);
-extern int xgi_fb_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
- DRMFILE filp);
+extern int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
+ struct drm_file * filp);
-extern int xgi_fb_free(struct xgi_info * info, unsigned long offset,
- DRMFILE filp);
+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);
-extern void xgi_pcie_lut_cleanup(struct xgi_info * info);
-
-extern int xgi_pcie_alloc(struct xgi_info * info,
- struct xgi_mem_alloc * alloc, DRMFILE filp);
-
-extern int xgi_pcie_free(struct xgi_info * info, unsigned long offset,
- DRMFILE filp);
extern void *xgi_find_pcie_virt(struct xgi_info * info, u32 address);
-extern void xgi_pcie_free_all(struct xgi_info *, DRMFILE);
-extern void xgi_fb_free_all(struct xgi_info *, DRMFILE);
-
-extern int xgi_fb_alloc_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_fb_free_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_pcie_alloc_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_pcie_free_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_ge_reset_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_dump_register_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_restore_registers_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_submit_cmdlist_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_test_rwinkernel_ioctl(DRM_IOCTL_ARGS);
-extern int xgi_state_change_ioctl(DRM_IOCTL_ARGS);
+extern void xgi_enable_mmio(struct xgi_info * info);
+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);
+extern int xgi_free_ioctl(struct drm_device * dev, void * data,
+ struct drm_file * filp);
+extern int xgi_submit_cmdlist(struct drm_device * dev, void * data,
+ struct drm_file * filp);
+extern int xgi_state_change_ioctl(struct drm_device * dev, void * data,
+ struct drm_file * filp);
#endif