Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Matthew Auld and committed by
Chris Wilson
e2f4367a c9749836

+8 -8
-8
drivers/gpu/drm/i915/gem/i915_gem_object.h
··· 384 384 void i915_gem_object_truncate(struct drm_i915_gem_object *obj); 385 385 void i915_gem_object_writeback(struct drm_i915_gem_object *obj); 386 386 387 - enum i915_map_type { 388 - I915_MAP_WB = 0, 389 - I915_MAP_WC, 390 - #define I915_MAP_OVERRIDE BIT(31) 391 - I915_MAP_FORCE_WB = I915_MAP_WB | I915_MAP_OVERRIDE, 392 - I915_MAP_FORCE_WC = I915_MAP_WC | I915_MAP_OVERRIDE, 393 - }; 394 - 395 387 /** 396 388 * i915_gem_object_pin_map - return a contiguous mapping of the entire object 397 389 * @obj: the object to map into kernel address space
+8
drivers/gpu/drm/i915/gem/i915_gem_object_types.h
··· 67 67 const char *name; /* friendly name for debug, e.g. lockdep classes */ 68 68 }; 69 69 70 + enum i915_map_type { 71 + I915_MAP_WB = 0, 72 + I915_MAP_WC, 73 + #define I915_MAP_OVERRIDE BIT(31) 74 + I915_MAP_FORCE_WB = I915_MAP_WB | I915_MAP_OVERRIDE, 75 + I915_MAP_FORCE_WC = I915_MAP_WC | I915_MAP_OVERRIDE, 76 + }; 77 + 70 78 enum i915_mmap_type { 71 79 I915_MMAP_TYPE_GTT = 0, 72 80 I915_MMAP_TYPE_WC,