Deleted Added
full compact
drmP.h (145132) drmP.h (148211)
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/*-
5 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
6 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
7 * All rights reserved.
8 *

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

24 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
25 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
26 * OTHER DEALINGS IN THE SOFTWARE.
27 *
28 * Authors:
29 * Rickard E. (Rik) Faith <faith@valinux.com>
30 * Gareth Hughes <gareth@valinux.com>
31 *
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/*-
5 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
6 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
7 * All rights reserved.
8 *

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

24 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
25 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
26 * OTHER DEALINGS IN THE SOFTWARE.
27 *
28 * Authors:
29 * Rickard E. (Rik) Faith <faith@valinux.com>
30 * Gareth Hughes <gareth@valinux.com>
31 *
32 * $FreeBSD: head/sys/dev/drm/drmP.h 145132 2005-04-16 03:44:47Z anholt $
32 * $FreeBSD: head/sys/dev/drm/drmP.h 148211 2005-07-20 21:10:57Z anholt $
33 */
34
35#ifndef _DRM_P_H_
36#define _DRM_P_H_
37
38#if defined(_KERNEL) || defined(__KERNEL__)
39
40typedef struct drm_device drm_device_t;

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

247#define DRM_AGP_FIND_DEVICE() agp_find_device(0)
248#define DRM_MTRR_WC MTRR_TYPE_WC
249#define jiffies hardclock_ticks
250
251typedef drm_device_t *device_t;
252extern struct cfdriver drm_cd;
253#endif /* !__FreeBSD__ */
254
33 */
34
35#ifndef _DRM_P_H_
36#define _DRM_P_H_
37
38#if defined(_KERNEL) || defined(__KERNEL__)
39
40typedef struct drm_device drm_device_t;

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

247#define DRM_AGP_FIND_DEVICE() agp_find_device(0)
248#define DRM_MTRR_WC MTRR_TYPE_WC
249#define jiffies hardclock_ticks
250
251typedef drm_device_t *device_t;
252extern struct cfdriver drm_cd;
253#endif /* !__FreeBSD__ */
254
255/* Capabilities taken from src/sys/dev/pci/pcireg.h. */
256#ifndef PCIY_AGP
257#define PCIY_AGP 0x02
258#endif
259
260#ifndef PCIY_EXPRESS
261#define PCIY_EXPRESS 0x10
262#endif
263
255typedef unsigned long dma_addr_t;
256typedef u_int32_t u32;
257typedef u_int16_t u16;
258typedef u_int8_t u8;
259
260/* DRM_READMEMORYBARRIER() prevents reordering of reads.
261 * DRM_WRITEMEMORYBARRIER() prevents reordering of writes.
262 * DRM_MEMORYBARRIER() prevents reordering of reads and writes.

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

816int drm_irq_uninstall(drm_device_t *dev);
817irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
818void drm_driver_irq_preinstall(drm_device_t *dev);
819void drm_driver_irq_postinstall(drm_device_t *dev);
820void drm_driver_irq_uninstall(drm_device_t *dev);
821int drm_vblank_wait(drm_device_t *dev, unsigned int *vbl_seq);
822void drm_vbl_send_signals(drm_device_t *dev);
823
264typedef unsigned long dma_addr_t;
265typedef u_int32_t u32;
266typedef u_int16_t u16;
267typedef u_int8_t u8;
268
269/* DRM_READMEMORYBARRIER() prevents reordering of reads.
270 * DRM_WRITEMEMORYBARRIER() prevents reordering of writes.
271 * DRM_MEMORYBARRIER() prevents reordering of reads and writes.

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

825int drm_irq_uninstall(drm_device_t *dev);
826irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
827void drm_driver_irq_preinstall(drm_device_t *dev);
828void drm_driver_irq_postinstall(drm_device_t *dev);
829void drm_driver_irq_uninstall(drm_device_t *dev);
830int drm_vblank_wait(drm_device_t *dev, unsigned int *vbl_seq);
831void drm_vbl_send_signals(drm_device_t *dev);
832
824/* AGP/GART support (drm_agpsupport.c) */
833/* AGP/PCI Express/GART support (drm_agpsupport.c) */
825int drm_device_is_agp(drm_device_t *dev);
834int drm_device_is_agp(drm_device_t *dev);
835int drm_device_is_pcie(drm_device_t *dev);
826drm_agp_head_t *drm_agp_init(void);
827void drm_agp_uninit(void);
828void drm_agp_do_release(void);
829void *drm_agp_allocate_memory(size_t pages, u32 type);
830int drm_agp_free_memory(void *handle);
831int drm_agp_bind_memory(void *handle, off_t start);
832int drm_agp_unbind_memory(void *handle);
833
834/* Scatter Gather Support (drm_scatter.c) */
835void drm_sg_cleanup(drm_sg_mem_t *entry);
836
837#ifdef __FreeBSD__
838/* sysctl support (drm_sysctl.h) */
839extern int drm_sysctl_init(drm_device_t *dev);
840extern int drm_sysctl_cleanup(drm_device_t *dev);
841#endif /* __FreeBSD__ */
842
843/* ATI PCIGART support (ati_pcigart.c) */
844int drm_ati_pcigart_init(drm_device_t *dev, unsigned long *addr,
836drm_agp_head_t *drm_agp_init(void);
837void drm_agp_uninit(void);
838void drm_agp_do_release(void);
839void *drm_agp_allocate_memory(size_t pages, u32 type);
840int drm_agp_free_memory(void *handle);
841int drm_agp_bind_memory(void *handle, off_t start);
842int drm_agp_unbind_memory(void *handle);
843
844/* Scatter Gather Support (drm_scatter.c) */
845void drm_sg_cleanup(drm_sg_mem_t *entry);
846
847#ifdef __FreeBSD__
848/* sysctl support (drm_sysctl.h) */
849extern int drm_sysctl_init(drm_device_t *dev);
850extern int drm_sysctl_cleanup(drm_device_t *dev);
851#endif /* __FreeBSD__ */
852
853/* ATI PCIGART support (ati_pcigart.c) */
854int drm_ati_pcigart_init(drm_device_t *dev, unsigned long *addr,
845 dma_addr_t *bus_addr);
855 dma_addr_t *bus_addr, int is_pcie);
846int drm_ati_pcigart_cleanup(drm_device_t *dev, unsigned long addr,
847 dma_addr_t bus_addr);
848
849/* Locking IOCTL support (drm_drv.c) */
850int drm_lock(DRM_IOCTL_ARGS);
851int drm_unlock(DRM_IOCTL_ARGS);
852int drm_version(DRM_IOCTL_ARGS);
853int drm_setversion(DRM_IOCTL_ARGS);

--- 94 unchanged lines hidden ---
856int drm_ati_pcigart_cleanup(drm_device_t *dev, unsigned long addr,
857 dma_addr_t bus_addr);
858
859/* Locking IOCTL support (drm_drv.c) */
860int drm_lock(DRM_IOCTL_ARGS);
861int drm_unlock(DRM_IOCTL_ARGS);
862int drm_version(DRM_IOCTL_ARGS);
863int drm_setversion(DRM_IOCTL_ARGS);

--- 94 unchanged lines hidden ---