mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 18:14:07 +08:00
drm/i915: move i915_map_type into i915_gem_object_types.h
Looks like it belongs there anyway, otherwise we have to include the entirety of i915_gem_object.h just to get at the enum. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20210119133106.66294-3-matthew.auld@intel.com
This commit is contained in:
parent
c97498363f
commit
e2f4367a47
@ -384,14 +384,6 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj);
|
|||||||
void i915_gem_object_truncate(struct drm_i915_gem_object *obj);
|
void i915_gem_object_truncate(struct drm_i915_gem_object *obj);
|
||||||
void i915_gem_object_writeback(struct drm_i915_gem_object *obj);
|
void i915_gem_object_writeback(struct drm_i915_gem_object *obj);
|
||||||
|
|
||||||
enum i915_map_type {
|
|
||||||
I915_MAP_WB = 0,
|
|
||||||
I915_MAP_WC,
|
|
||||||
#define I915_MAP_OVERRIDE BIT(31)
|
|
||||||
I915_MAP_FORCE_WB = I915_MAP_WB | I915_MAP_OVERRIDE,
|
|
||||||
I915_MAP_FORCE_WC = I915_MAP_WC | I915_MAP_OVERRIDE,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i915_gem_object_pin_map - return a contiguous mapping of the entire object
|
* i915_gem_object_pin_map - return a contiguous mapping of the entire object
|
||||||
* @obj: the object to map into kernel address space
|
* @obj: the object to map into kernel address space
|
||||||
|
@ -67,6 +67,14 @@ struct drm_i915_gem_object_ops {
|
|||||||
const char *name; /* friendly name for debug, e.g. lockdep classes */
|
const char *name; /* friendly name for debug, e.g. lockdep classes */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum i915_map_type {
|
||||||
|
I915_MAP_WB = 0,
|
||||||
|
I915_MAP_WC,
|
||||||
|
#define I915_MAP_OVERRIDE BIT(31)
|
||||||
|
I915_MAP_FORCE_WB = I915_MAP_WB | I915_MAP_OVERRIDE,
|
||||||
|
I915_MAP_FORCE_WC = I915_MAP_WC | I915_MAP_OVERRIDE,
|
||||||
|
};
|
||||||
|
|
||||||
enum i915_mmap_type {
|
enum i915_mmap_type {
|
||||||
I915_MMAP_TYPE_GTT = 0,
|
I915_MMAP_TYPE_GTT = 0,
|
||||||
I915_MMAP_TYPE_WC,
|
I915_MMAP_TYPE_WC,
|
||||||
|
Loading…
Reference in New Issue
Block a user