diff options
Diffstat (limited to 'include/drm/nouveau_drm.h')
-rw-r--r-- | include/drm/nouveau_drm.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h index 01a714119506..e2cfe80f6fca 100644 --- a/include/drm/nouveau_drm.h +++ b/include/drm/nouveau_drm.h | |||
@@ -71,15 +71,14 @@ struct drm_nouveau_gpuobj_free { | |||
71 | #define NOUVEAU_GETPARAM_PCI_VENDOR 3 | 71 | #define NOUVEAU_GETPARAM_PCI_VENDOR 3 |
72 | #define NOUVEAU_GETPARAM_PCI_DEVICE 4 | 72 | #define NOUVEAU_GETPARAM_PCI_DEVICE 4 |
73 | #define NOUVEAU_GETPARAM_BUS_TYPE 5 | 73 | #define NOUVEAU_GETPARAM_BUS_TYPE 5 |
74 | #define NOUVEAU_GETPARAM_FB_PHYSICAL 6 | ||
75 | #define NOUVEAU_GETPARAM_AGP_PHYSICAL 7 | ||
76 | #define NOUVEAU_GETPARAM_FB_SIZE 8 | 74 | #define NOUVEAU_GETPARAM_FB_SIZE 8 |
77 | #define NOUVEAU_GETPARAM_AGP_SIZE 9 | 75 | #define NOUVEAU_GETPARAM_AGP_SIZE 9 |
78 | #define NOUVEAU_GETPARAM_PCI_PHYSICAL 10 | ||
79 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 | 76 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 |
80 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 | 77 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 |
81 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 | 78 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 |
82 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 | 79 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 |
80 | #define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 | ||
81 | #define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 | ||
83 | struct drm_nouveau_getparam { | 82 | struct drm_nouveau_getparam { |
84 | uint64_t param; | 83 | uint64_t param; |
85 | uint64_t value; | 84 | uint64_t value; |
@@ -95,6 +94,12 @@ struct drm_nouveau_setparam { | |||
95 | #define NOUVEAU_GEM_DOMAIN_GART (1 << 2) | 94 | #define NOUVEAU_GEM_DOMAIN_GART (1 << 2) |
96 | #define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3) | 95 | #define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3) |
97 | 96 | ||
97 | #define NOUVEAU_GEM_TILE_LAYOUT_MASK 0x0000ff00 | ||
98 | #define NOUVEAU_GEM_TILE_16BPP 0x00000001 | ||
99 | #define NOUVEAU_GEM_TILE_32BPP 0x00000002 | ||
100 | #define NOUVEAU_GEM_TILE_ZETA 0x00000004 | ||
101 | #define NOUVEAU_GEM_TILE_NONCONTIG 0x00000008 | ||
102 | |||
98 | struct drm_nouveau_gem_info { | 103 | struct drm_nouveau_gem_info { |
99 | uint32_t handle; | 104 | uint32_t handle; |
100 | uint32_t domain; | 105 | uint32_t domain; |
@@ -164,7 +169,6 @@ struct drm_nouveau_gem_pushbuf { | |||
164 | }; | 169 | }; |
165 | 170 | ||
166 | #define NOUVEAU_GEM_CPU_PREP_NOWAIT 0x00000001 | 171 | #define NOUVEAU_GEM_CPU_PREP_NOWAIT 0x00000001 |
167 | #define NOUVEAU_GEM_CPU_PREP_NOBLOCK 0x00000002 | ||
168 | #define NOUVEAU_GEM_CPU_PREP_WRITE 0x00000004 | 172 | #define NOUVEAU_GEM_CPU_PREP_WRITE 0x00000004 |
169 | struct drm_nouveau_gem_cpu_prep { | 173 | struct drm_nouveau_gem_cpu_prep { |
170 | uint32_t handle; | 174 | uint32_t handle; |