diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-14 11:35:15 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-20 11:59:14 -0400 |
commit | f329f5f6eb4fad8f2e9c62fe37ec01ae5ce0f212 (patch) | |
tree | 2a651f06e0f9806da10d44cfaf20c00e972d4291 /drivers/gpu/drm/i915/i915_gem_gtt.h | |
parent | 5c5f645773b6d147bf68c350674dc3ef4f8de83d (diff) |
drm/i915: Move PTE_READ_ONLY to ->pte_encode vfunc
It's only used as a flag there, so unconfuse things a bit.
Also separate the bind_vma flag space from the pte_encode flag
space in the code.
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index 12d0ded0d823..fb0a04aa5363 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h | |||
@@ -158,7 +158,6 @@ struct i915_vma { | |||
158 | /** Flags and address space this VMA is bound to */ | 158 | /** Flags and address space this VMA is bound to */ |
159 | #define GLOBAL_BIND (1<<0) | 159 | #define GLOBAL_BIND (1<<0) |
160 | #define LOCAL_BIND (1<<1) | 160 | #define LOCAL_BIND (1<<1) |
161 | #define PTE_READ_ONLY (1<<2) | ||
162 | unsigned int bound : 4; | 161 | unsigned int bound : 4; |
163 | 162 | ||
164 | /** | 163 | /** |
@@ -261,6 +260,8 @@ struct i915_address_space { | |||
261 | gen6_pte_t (*pte_encode)(dma_addr_t addr, | 260 | gen6_pte_t (*pte_encode)(dma_addr_t addr, |
262 | enum i915_cache_level level, | 261 | enum i915_cache_level level, |
263 | bool valid, u32 flags); /* Create a valid PTE */ | 262 | bool valid, u32 flags); /* Create a valid PTE */ |
263 | /* flags for pte_encode */ | ||
264 | #define PTE_READ_ONLY (1<<0) | ||
264 | int (*allocate_va_range)(struct i915_address_space *vm, | 265 | int (*allocate_va_range)(struct i915_address_space *vm, |
265 | uint64_t start, | 266 | uint64_t start, |
266 | uint64_t length); | 267 | uint64_t length); |