diff options
author | Eric Anholt <eric@anholt.net> | 2008-01-24 12:32:08 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-01-24 12:44:19 -0800 |
commit | e3c42f00042ffacc7868ed608b9ecf786dcc4e4a (patch) | |
tree | 0a164cc5c544a1a48cbf381ad99127bedbc17160 /shared-core/i915_drm.h | |
parent | c7ee6cc269c26d8e7ed98a16a272eca63daab201 (diff) | |
parent | 5b9930645227d52f47b6dc85cd1aee65bb5820ad (diff) |
Merge commit 'airlied/i915-ttm-cfu'
This requires updated Mesa to handle the new relocation format.
Diffstat (limited to 'shared-core/i915_drm.h')
-rw-r--r-- | shared-core/i915_drm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index cfa3f93a..c8a9cb76 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -329,9 +329,9 @@ typedef struct drm_i915_hws_addr { /* * Relocation header is 4 uint32_ts - * 0 - (16-bit relocation type << 16)| 16 bit reloc count - * 1 - buffer handle for another list of relocs - * 2-3 - spare. + * 0 - 32 bit reloc count + * 1 - 32-bit relocation type + * 2-3 - 64-bit user buffer handle ptr for another list of relocs. */ #define I915_RELOC_HEADER 4 @@ -339,7 +339,7 @@ typedef struct drm_i915_hws_addr { * type 0 relocation has 4-uint32_t stride * 0 - offset into buffer * 1 - delta to add in - * 2 - index into buffer list + * 2 - buffer handle * 3 - reserved (for optimisations later). */ #define I915_RELOC_TYPE_0 0 @@ -347,7 +347,7 @@ typedef struct drm_i915_hws_addr { struct drm_i915_op_arg { uint64_t next; - uint32_t reloc_handle; + uint64_t reloc_ptr; int handled; union { struct drm_bo_op_req req; |