diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
| commit | 0467ad41188031073cbbad1139a916e2439af2f1 (patch) | |
| tree | aff3efec2713270322125cadf07c62b87c5a2127 /shared-core/nouveau_drm.h | |
| parent | fe4cc50983bdaf51bf29ef041f65e0007f547844 (diff) | |
| parent | e22225416a12c2beab7a5bcb866d214ee212cbc4 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_drm.h')
| -rw-r--r-- | shared-core/nouveau_drm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h index 8a1964ed..c3a69a8f 100644 --- a/shared-core/nouveau_drm.h +++ b/shared-core/nouveau_drm.h @@ -25,7 +25,7 @@ #ifndef __NOUVEAU_DRM_H__ #define __NOUVEAU_DRM_H__ -#define NOUVEAU_DRM_HEADER_PATCHLEVEL 4 +#define NOUVEAU_DRM_HEADER_PATCHLEVEL 5 typedef struct drm_nouveau_fifo_alloc { int channel; @@ -40,6 +40,7 @@ typedef struct drm_nouveau_fifo_alloc { drm_nouveau_fifo_alloc_t; typedef struct drm_nouveau_object_init { + int channel; uint32_t handle; int class; } @@ -49,6 +50,7 @@ drm_nouveau_object_init_t; #define NOUVEAU_MEM_ACCESS_WO 2 #define NOUVEAU_MEM_ACCESS_RW 3 typedef struct drm_nouveau_dma_object_init { + int channel; uint32_t handle; int class; int access; |