Deleted Added
full compact
drmP.h (113995) drmP.h (119098)
1/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
2 * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
3 *
4 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All rights reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 13 unchanged lines hidden (view full) ---

22 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
23 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
24 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Rickard E. (Rik) Faith <faith@valinux.com>
29 * Gareth Hughes <gareth@valinux.com>
1/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
2 * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
3 *
4 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All rights reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 13 unchanged lines hidden (view full) ---

22 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
23 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
24 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Rickard E. (Rik) Faith <faith@valinux.com>
29 * Gareth Hughes <gareth@valinux.com>
30 * $FreeBSD: head/sys/dev/drm/drmP.h 113995 2003-04-25 01:18:47Z anholt $
30 *
31 * $FreeBSD: head/sys/dev/drm/drmP.h 119098 2003-08-19 02:57:31Z anholt $
31 */
32
33#ifndef _DRM_P_H_
34#define _DRM_P_H_
35
36#if defined(_KERNEL) || defined(__KERNEL__)
37
38/* DRM template customization defaults

--- 57 unchanged lines hidden (view full) ---

96#define DRM_MEM_BOUNDAGP 16
97#define DRM_MEM_CTXBITMAP 17
98#define DRM_MEM_STUB 18
99#define DRM_MEM_SGLISTS 19
100
101#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
102
103 /* Mapping helper macros */
32 */
33
34#ifndef _DRM_P_H_
35#define _DRM_P_H_
36
37#if defined(_KERNEL) || defined(__KERNEL__)
38
39/* DRM template customization defaults

--- 57 unchanged lines hidden (view full) ---

97#define DRM_MEM_BOUNDAGP 16
98#define DRM_MEM_CTXBITMAP 17
99#define DRM_MEM_STUB 18
100#define DRM_MEM_SGLISTS 19
101
102#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
103
104 /* Mapping helper macros */
104#define DRM_IOREMAP(map) \
105#define DRM_IOREMAP(map, dev) \
105 (map)->handle = DRM(ioremap)( dev, map )
106
106 (map)->handle = DRM(ioremap)( dev, map )
107
107#define DRM_IOREMAP_NOCACHE(map) \
108#define DRM_IOREMAP_NOCACHE(map, dev) \
108 (map)->handle = DRM(ioremap_nocache)( dev, map )
109
109 (map)->handle = DRM(ioremap_nocache)( dev, map )
110
110#define DRM_IOREMAPFREE(map) \
111#define DRM_IOREMAPFREE(map, dev) \
111 do { \
112 if ( (map)->handle && (map)->size ) \
113 DRM(ioremapfree)( map ); \
114 } while (0)
115
116 /* Internal types and structures */
117#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
118#define DRM_MIN(a,b) ((a)<(b)?(a):(b))

--- 72 unchanged lines hidden (view full) ---

191} drm_freelist_t;
192
193typedef struct drm_buf_entry {
194 int buf_size;
195 int buf_count;
196 drm_buf_t *buflist;
197 int seg_count;
198 int page_order;
112 do { \
113 if ( (map)->handle && (map)->size ) \
114 DRM(ioremapfree)( map ); \
115 } while (0)
116
117 /* Internal types and structures */
118#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
119#define DRM_MIN(a,b) ((a)<(b)?(a):(b))

--- 72 unchanged lines hidden (view full) ---

192} drm_freelist_t;
193
194typedef struct drm_buf_entry {
195 int buf_size;
196 int buf_count;
197 drm_buf_t *buflist;
198 int seg_count;
199 int page_order;
199 unsigned long *seglist;
200 vm_offset_t *seglist;
201 dma_addr_t *seglist_bus;
200
201 drm_freelist_t freelist;
202} drm_buf_entry_t;
203
204typedef struct drm_hw_lock {
205 __volatile__ unsigned int lock;
206 char padding[60]; /* Pad to cache line */
207} drm_hw_lock_t;

--- 189 unchanged lines hidden (view full) ---

397extern int DRM(version)( DRM_IOCTL_ARGS );
398
399 /* Memory management support (drm_memory.h) */
400extern void DRM(mem_init)(void);
401extern void DRM(mem_uninit)(void);
402extern void *DRM(alloc)(size_t size, int area);
403extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
404 int area);
202
203 drm_freelist_t freelist;
204} drm_buf_entry_t;
205
206typedef struct drm_hw_lock {
207 __volatile__ unsigned int lock;
208 char padding[60]; /* Pad to cache line */
209} drm_hw_lock_t;

--- 189 unchanged lines hidden (view full) ---

399extern int DRM(version)( DRM_IOCTL_ARGS );
400
401 /* Memory management support (drm_memory.h) */
402extern void DRM(mem_init)(void);
403extern void DRM(mem_uninit)(void);
404extern void *DRM(alloc)(size_t size, int area);
405extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
406 int area);
405extern char *DRM(strdup)(const char *s, int area);
406extern void DRM(strfree)(char *s, int area);
407extern void DRM(free)(void *pt, size_t size, int area);
408extern void *DRM(ioremap)(drm_device_t *dev, drm_local_map_t *map);
407extern void DRM(free)(void *pt, size_t size, int area);
408extern void *DRM(ioremap)(drm_device_t *dev, drm_local_map_t *map);
409extern void *DRM(ioremap_nocache)(drm_device_t *dev, drm_local_map_t *map);
410extern void DRM(ioremapfree)(drm_local_map_t *map);
411
412#if __REALLY_HAVE_AGP
413extern agp_memory *DRM(alloc_agp)(int pages, u32 type);
414extern int DRM(free_agp)(agp_memory *handle, int pages);
415extern int DRM(bind_agp)(agp_memory *handle, unsigned int start);
416extern int DRM(unbind_agp)(agp_memory *handle);
417#endif

--- 25 unchanged lines hidden (view full) ---

443 /* DMA support (drm_dma.h) */
444extern int DRM(dma_setup)(drm_device_t *dev);
445extern void DRM(dma_takedown)(drm_device_t *dev);
446extern void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf);
447extern void DRM(reclaim_buffers)(drm_device_t *dev, DRMFILE filp);
448#if __HAVE_DMA_IRQ
449extern int DRM(irq_install)( drm_device_t *dev, int irq );
450extern int DRM(irq_uninstall)( drm_device_t *dev );
409extern void DRM(ioremapfree)(drm_local_map_t *map);
410
411#if __REALLY_HAVE_AGP
412extern agp_memory *DRM(alloc_agp)(int pages, u32 type);
413extern int DRM(free_agp)(agp_memory *handle, int pages);
414extern int DRM(bind_agp)(agp_memory *handle, unsigned int start);
415extern int DRM(unbind_agp)(agp_memory *handle);
416#endif

--- 25 unchanged lines hidden (view full) ---

442 /* DMA support (drm_dma.h) */
443extern int DRM(dma_setup)(drm_device_t *dev);
444extern void DRM(dma_takedown)(drm_device_t *dev);
445extern void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf);
446extern void DRM(reclaim_buffers)(drm_device_t *dev, DRMFILE filp);
447#if __HAVE_DMA_IRQ
448extern int DRM(irq_install)( drm_device_t *dev, int irq );
449extern int DRM(irq_uninstall)( drm_device_t *dev );
451extern void DRM(dma_service)( DRM_IRQ_ARGS );
450extern irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS );
452extern void DRM(driver_irq_preinstall)( drm_device_t *dev );
453extern void DRM(driver_irq_postinstall)( drm_device_t *dev );
454extern void DRM(driver_irq_uninstall)( drm_device_t *dev );
455#if __HAVE_DMA_IRQ_BH
456extern void DRM(dma_immediate_bh)( DRM_TASKQUEUE_ARGS );
457#endif
458#endif
459

--- 100 unchanged lines hidden (view full) ---

560#endif
561
562/* Scatter Gather Support (drm_scatter.h) */
563#if __HAVE_SG
564extern int DRM(sg_alloc)(DRM_IOCTL_ARGS);
565extern int DRM(sg_free)(DRM_IOCTL_ARGS);
566#endif
567
451extern void DRM(driver_irq_preinstall)( drm_device_t *dev );
452extern void DRM(driver_irq_postinstall)( drm_device_t *dev );
453extern void DRM(driver_irq_uninstall)( drm_device_t *dev );
454#if __HAVE_DMA_IRQ_BH
455extern void DRM(dma_immediate_bh)( DRM_TASKQUEUE_ARGS );
456#endif
457#endif
458

--- 100 unchanged lines hidden (view full) ---

559#endif
560
561/* Scatter Gather Support (drm_scatter.h) */
562#if __HAVE_SG
563extern int DRM(sg_alloc)(DRM_IOCTL_ARGS);
564extern int DRM(sg_free)(DRM_IOCTL_ARGS);
565#endif
566
567/* consistent PCI memory functions (drm_pci.h) */
568extern void *DRM(pci_alloc)(drm_device_t *dev, size_t size,
569 size_t align, dma_addr_t maxaddr,
570 dma_addr_t *busaddr);
571extern void DRM(pci_free)(drm_device_t *dev, size_t size,
572 void *vaddr, dma_addr_t busaddr);
568
569#endif /* __KERNEL__ */
570#endif /* _DRM_P_H_ */
573
574#endif /* __KERNEL__ */
575#endif /* _DRM_P_H_ */