Commit 0438fd1a authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220316095018.137998-1-jani.nikula@intel.com
parent e5086cb3

drivers/gpu/drm/i915/gem/i915_gem_phys.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "i915_drv.h"

#include "i915_gem_object.h"

#include "i915_gem_region.h"

#include "i915_gem_tiling.h"

#include "i915_scatterlist.h"



static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

+2 −1
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ 


#include "gem/i915_gem_region.h"

#include "i915_drv.h"

#include "i915_gemfs.h"

#include "i915_gem_object.h"

#include "i915_gem_tiling.h"

#include "i915_gemfs.h"

#include "i915_scatterlist.h"

#include "i915_trace.h"

drivers/gpu/drm/i915/gem/i915_gem_tiling.c

+8 −0
Original line number Diff line number Diff line
@@ -219,6 +219,14 @@ i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj, 
	return ret;

}



bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);



	return to_gt(i915)->ggtt->bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&

		i915_gem_object_is_tiled(obj);

}



int

i915_gem_object_set_tiling(struct drm_i915_gem_object *obj,

			   unsigned int tiling, unsigned int stride)

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

+2 −0
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 


#include <linux/types.h>



struct drm_i915_gem_object;

struct drm_i915_private;



bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj);

u32 i915_gem_fence_size(struct drm_i915_private *i915, u32 size,

			unsigned int tiling, unsigned int stride);

u32 i915_gem_fence_alignment(struct drm_i915_private *i915, u32 size,

drivers/gpu/drm/i915/i915_drv.h

+0 −9
Original line number Diff line number Diff line
@@ -1474,15 +1474,6 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv); 


int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file);



/* i915_gem_tiling.c */

static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);



	return to_gt(i915)->ggtt->bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&

		i915_gem_object_is_tiled(obj);

}



/* intel_device_info.c */

static inline struct intel_device_info *

mkwrite_device_info(struct drm_i915_private *dev_priv)