diff options
| author | Daniel Vetter | 2015-04-14 17:35:15 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-04-20 17:59:14 +0200 |
| commit | f329f5f6eb4fad8f2e9c62fe37ec01ae5ce0f212 (patch) | |
| tree | 2a651f06e0f9806da10d44cfaf20c00e972d4291 /drivers/gpu/drm/i915/i915_gem_gtt.h | |
| parent | drm/i915: Unify aliasing ppgtt handling (diff) | |
| download | kernel-qcow2-linux-f329f5f6eb4fad8f2e9c62fe37ec01ae5ce0f212.tar.gz kernel-qcow2-linux-f329f5f6eb4fad8f2e9c62fe37ec01ae5ce0f212.tar.xz kernel-qcow2-linux-f329f5f6eb4fad8f2e9c62fe37ec01ae5ce0f212.zip | |
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 { /** Flags and address space this VMA is bound to */ #define GLOBAL_BIND (1<<0) #define LOCAL_BIND (1<<1) -#define PTE_READ_ONLY (1<<2) unsigned int bound : 4; /** @@ -261,6 +260,8 @@ struct i915_address_space { gen6_pte_t (*pte_encode)(dma_addr_t addr, enum i915_cache_level level, bool valid, u32 flags); /* Create a valid PTE */ + /* flags for pte_encode */ +#define PTE_READ_ONLY (1<<0) int (*allocate_va_range)(struct i915_address_space *vm, uint64_t start, uint64_t length); |