diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-19 06:42:05 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-20 04:41:36 -0500 |
commit | 72bfa19c8deb4d1db5ad068c34fd580cb295cbe8 (patch) | |
tree | ff1af345701389b7c6b3c8cffa4c6d704f0ccdab /include/drm | |
parent | 3b8d8d91d51c7d15cda51052624169edf7b6dbc6 (diff) |
drm/i915: Allow the application to choose the constant addressing mode
The relative-to-general state default is useless as it means having to
rewrite the streaming kernels for each batch. Relative-to-surface is
more useful, as that stream usually needs to be rewritten for each
batch. And absolute addressing mode, vital if you start streaming
state, is also only available by adjusting the register...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/i915_drm.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index a2776e2807a4..0039f1f97ad8 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
@@ -289,6 +289,7 @@ typedef struct drm_i915_irq_wait { | |||
289 | #define I915_PARAM_HAS_BLT 11 | 289 | #define I915_PARAM_HAS_BLT 11 |
290 | #define I915_PARAM_HAS_RELAXED_FENCING 12 | 290 | #define I915_PARAM_HAS_RELAXED_FENCING 12 |
291 | #define I915_PARAM_HAS_COHERENT_RINGS 13 | 291 | #define I915_PARAM_HAS_COHERENT_RINGS 13 |
292 | #define I915_PARAM_HAS_EXEC_CONSTANTS 14 | ||
292 | 293 | ||
293 | typedef struct drm_i915_getparam { | 294 | typedef struct drm_i915_getparam { |
294 | int param; | 295 | int param; |
@@ -635,6 +636,17 @@ struct drm_i915_gem_execbuffer2 { | |||
635 | #define I915_EXEC_RENDER (1<<0) | 636 | #define I915_EXEC_RENDER (1<<0) |
636 | #define I915_EXEC_BSD (2<<0) | 637 | #define I915_EXEC_BSD (2<<0) |
637 | #define I915_EXEC_BLT (3<<0) | 638 | #define I915_EXEC_BLT (3<<0) |
639 | |||
640 | /* Used for switching the constants addressing mode on gen4+ RENDER ring. | ||
641 | * Gen6+ only supports relative addressing to dynamic state (default) and | ||
642 | * absolute addressing. | ||
643 | * | ||
644 | * These flags are ignored for the BSD and BLT rings. | ||
645 | */ | ||
646 | #define I915_EXEC_CONSTANTS_MASK (3<<6) | ||
647 | #define I915_EXEC_CONSTANTS_REL_GENERAL (0<<6) /* default */ | ||
648 | #define I915_EXEC_CONSTANTS_ABSOLUTE (1<<6) | ||
649 | #define I915_EXEC_CONSTANTS_REL_SURFACE (2<<6) /* gen4/5 only */ | ||
638 | __u64 flags; | 650 | __u64 flags; |
639 | __u64 rsvd1; | 651 | __u64 rsvd1; |
640 | __u64 rsvd2; | 652 | __u64 rsvd2; |