diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
commit | 88bd1e4a350d011ec44f6786e0bfdf8fb386800c (patch) | |
tree | e78d09fe0eb28514aa060de05ba8aee298fd120e /shared-core/i915_drm.h | |
parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) | |
parent | 612c22f131a25915196e69d7ec1adb6f4ec84a60 (diff) |
Merge branch 'intel-post-reloc'
Conflicts:
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/drm_ttm.c
shared-core/i915_dma.c
Bump driver minor to 13 due to introduction of new
relocation type.
Diffstat (limited to 'shared-core/i915_drm.h')
-rw-r--r-- | shared-core/i915_drm.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index b93df670..de463614 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -358,8 +358,22 @@ typedef struct drm_i915_hws_addr { * 2 - buffer handle * 3 - reserved (for optimisations later). */ +/* + * type 1 relocation has 4-uint32_t stride. + * Hangs off the first item in the op list. + * Performed after all valiations are done. + * Try to group relocs into the same relocatee together for + * performance reasons. + * 0 - offset into buffer + * 1 - delta to add in + * 2 - buffer index in op list. + * 3 - relocatee index in op list. + */ #define I915_RELOC_TYPE_0 0 #define I915_RELOC0_STRIDE 4 +#define I915_RELOC_TYPE_1 1 +#define I915_RELOC1_STRIDE 4 + struct drm_i915_op_arg { uint64_t next; |