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

drm/i915: move i915_gem_object_needs_bit17_swizzle() to i915_gem_tiling.[ch]

Move i915_gem_object_needs_bit17_swizzle() to i915_gem_tiling.[ch] as a
i915_gem_object function related to tiling. Also un-inline while at it;
does not seem like this is a function needed in hot paths.

v2: i915_gem_tiling.[ch] instead of intel_ggtt_fencing.[ch] (Chris)

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220316095018.137998-1-jani.nikula@intel.com

+13 -10
+1
drivers/gpu/drm/i915/gem/i915_gem_phys.c
··· 14 14 #include "i915_drv.h" 15 15 #include "i915_gem_object.h" 16 16 #include "i915_gem_region.h" 17 + #include "i915_gem_tiling.h" 17 18 #include "i915_scatterlist.h" 18 19 19 20 static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
+2 -1
drivers/gpu/drm/i915/gem/i915_gem_shmem.c
··· 12 12 13 13 #include "gem/i915_gem_region.h" 14 14 #include "i915_drv.h" 15 - #include "i915_gemfs.h" 16 15 #include "i915_gem_object.h" 16 + #include "i915_gem_tiling.h" 17 + #include "i915_gemfs.h" 17 18 #include "i915_scatterlist.h" 18 19 #include "i915_trace.h" 19 20
+8
drivers/gpu/drm/i915/gem/i915_gem_tiling.c
··· 219 219 return ret; 220 220 } 221 221 222 + bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj) 223 + { 224 + struct drm_i915_private *i915 = to_i915(obj->base.dev); 225 + 226 + return to_gt(i915)->ggtt->bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 && 227 + i915_gem_object_is_tiled(obj); 228 + } 229 + 222 230 int 223 231 i915_gem_object_set_tiling(struct drm_i915_gem_object *obj, 224 232 unsigned int tiling, unsigned int stride)
+2
drivers/gpu/drm/i915/gem/i915_gem_tiling.h
··· 8 8 9 9 #include <linux/types.h> 10 10 11 + struct drm_i915_gem_object; 11 12 struct drm_i915_private; 12 13 14 + bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj); 13 15 u32 i915_gem_fence_size(struct drm_i915_private *i915, u32 size, 14 16 unsigned int tiling, unsigned int stride); 15 17 u32 i915_gem_fence_alignment(struct drm_i915_private *i915, u32 size,
-9
drivers/gpu/drm/i915/i915_drv.h
··· 1474 1474 1475 1475 int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file); 1476 1476 1477 - /* i915_gem_tiling.c */ 1478 - static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj) 1479 - { 1480 - struct drm_i915_private *i915 = to_i915(obj->base.dev); 1481 - 1482 - return to_gt(i915)->ggtt->bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 && 1483 - i915_gem_object_is_tiled(obj); 1484 - } 1485 - 1486 1477 /* intel_device_info.c */ 1487 1478 static inline struct intel_device_info * 1488 1479 mkwrite_device_info(struct drm_i915_private *dev_priv)