diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-01 09:02:09 -0500 |
|---|---|---|
| committer | Nian Wu <nian@tinderbox.sh.intel.com> | 2007-03-01 09:02:09 -0500 |
| commit | 6c48b8e7ffd0af4d49855d7175e822f4af1f526f (patch) | |
| tree | 4ec7cf10147f3a17e6d4eeec8e48faa90880b8d9 /shared-core/nouveau_drv.h | |
| parent | 0bbbb46650667c84a50f1a675a7a910d6ef7df4b (diff) | |
| parent | 72caa48c82e4334d3292185dbadf758d2dd14c16 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index 63721650..c3d19bb0 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -34,7 +34,7 @@ #define DRIVER_MAJOR 0 #define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 3 +#define DRIVER_PATCHLEVEL 4 #define NOUVEAU_FAMILY 0x0000FFFF #define NOUVEAU_FLAGS 0xFFFF0000 @@ -70,9 +70,6 @@ struct nouveau_object int engine; }; -#define NV_DMA_TARGET_VIDMEM 0 -#define NV_DMA_TARGET_PCI 2 -#define NV_DMA_TARGET_AGP 3 struct nouveau_fifo { int used; @@ -134,7 +131,9 @@ typedef struct drm_nouveau_private { /* base physical adresses */ uint64_t fb_phys; + uint64_t fb_available_size; uint64_t agp_phys; + uint64_t agp_available_size; /* the mtrr covering the FB */ int fb_mtrr; @@ -192,8 +191,10 @@ extern void nouveau_fifo_free(drm_device_t *dev, int channel); /* nouveau_object.c */ extern void nouveau_object_cleanup(drm_device_t *dev, DRMFILE filp); -extern struct nouveau_object *nouveau_dma_object_create(drm_device_t *dev, - uint32_t offset, uint32_t size, int access, uint32_t target); +extern struct nouveau_object * +nouveau_dma_object_create(drm_device_t *dev, int class, + uint32_t offset, uint32_t size, + int access, int target); extern int nouveau_ioctl_object_init(DRM_IOCTL_ARGS); extern int nouveau_ioctl_dma_object_init(DRM_IOCTL_ARGS); extern uint32_t nouveau_chip_instance_get(drm_device_t *dev, struct mem_block *mem); |