Commit e2f4367a authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

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: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119133106.66294-3-matthew.auld@intel.com
parent c9749836

drivers/gpu/drm/i915/gem/i915_gem_object.h

+0 −8
Original line number Diff line number Diff line
@@ -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_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

 * @obj: the object to map into kernel address space

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,14 @@ struct drm_i915_gem_object_ops { 
	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 {

	I915_MMAP_TYPE_GTT = 0,

	I915_MMAP_TYPE_WC,