summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2009-06-03 13:54:43 +1000
committerBen Skeggs <bskeggs@redhat.com>2009-06-05 14:07:23 +1000
commit3d4bfe8c893d016ef43d1ebf28e4607aa1f540a4 (patch)
tree5d2f6f2fb4aa712a54b81ce9bd7d8d17f9e2dfa9 /shared-core
parent2cb4c64d7310904b354365c2cbc263211e9eb4a1 (diff)
nouveau: 0.0.14 + extend bo interface to support subrange mapping
Normal map() should operate as before, and map_range()/map_flush() should give correct results but lacking any performance difference from map(). Nothing exiting being done here yet, but the interface is a good start.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/nouveau_drm.h6
-rw-r--r--shared-core/nouveau_drv.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h
index e999d20d..dc6a1945 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 13
+#define NOUVEAU_DRM_HEADER_PATCHLEVEL 14
struct drm_nouveau_channel_alloc {
uint32_t fb_ctxdma_handle;
@@ -154,8 +154,6 @@ struct drm_nouveau_setparam {
#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)
#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
#define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)
-#define NOUVEAU_GEM_DOMAIN_TILE (1 << 30)
-#define NOUVEAU_GEM_DOMAIN_TILE_ZETA (1 << 31)
struct drm_nouveau_gem_info {
uint32_t handle;
@@ -163,6 +161,8 @@ struct drm_nouveau_gem_info {
uint64_t size;
uint64_t offset;
uint64_t map_handle;
+ uint32_t tile_mode;
+ uint32_t tile_flags;
};
struct drm_nouveau_gem_new {
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h
index ce52ce27..841cbf53 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 13
+#define DRIVER_PATCHLEVEL 14
#define NOUVEAU_FAMILY 0x0000FFFF
#define NOUVEAU_FLAGS 0xFFFF0000