Commit 9834dfef authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Prune inlines 



Remove all the manual inlines from non-critical sections in gt/

add/remove: 2/0 grow/shrink: 0/3 up/down: 762/-1473 (-711)
Function                                     old     new   delta
mi_set_context.isra                            -     602    +602
write_dma_entry                                -     160    +160
__set_pd_entry                               214      69    -145
clear_pd_entry                               190      42    -148
ring_request_alloc                          2021     841   -1180
Total: Before=1605086, After=1604375, chg -0.04%

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210113152224.29794-1-chris@chris-wilson.co.uk
parent e7326336

drivers/gpu/drm/i915/gt/gen6_ppgtt.c

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "intel_gt.h"



/* Write pde (index) from the page directory @pd to the page table @pt */

static inline void gen6_write_pde(const struct gen6_ppgtt *ppgtt,

static void gen6_write_pde(const struct gen6_ppgtt *ppgtt,

			   const unsigned int pde,

			   const struct i915_page_table *pt)

{

drivers/gpu/drm/i915/gt/gen7_renderclear.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct batch_vals { 
	u32 size;

};



static inline int num_primitives(const struct batch_vals *bv)

static int num_primitives(const struct batch_vals *bv)

{

	/*

	 * We need to saturate the GPU with work in order to dispatch

drivers/gpu/drm/i915/gt/gen8_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) 
	return 0;

}



static inline u32 preempt_address(struct intel_engine_cs *engine)

static u32 preempt_address(struct intel_engine_cs *engine)

{

	return (i915_ggtt_offset(engine->status_page.vma) +

		I915_GEM_HWS_PREEMPT_ADDR);

drivers/gpu/drm/i915/gt/gen8_ppgtt.c

+6 −7
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void gen8_ppgtt_notify_vgt(struct i915_ppgtt *ppgtt, bool create) 


#define as_pd(x) container_of((x), typeof(struct i915_page_directory), pt)



static inline unsigned int

static unsigned int

gen8_pd_range(u64 start, u64 end, int lvl, unsigned int *idx)

{

	const int shift = gen8_pd_shift(lvl);
@@ -125,7 +125,7 @@ gen8_pd_range(u64 start, u64 end, int lvl, unsigned int *idx) 
		return i915_pde_index(end, shift) - *idx;

}



static inline bool gen8_pd_contains(u64 start, u64 end, int lvl)

static bool gen8_pd_contains(u64 start, u64 end, int lvl)

{

	const u64 mask = ~0ull << gen8_pd_shift(lvl + 1);
@@ -133,7 +133,7 @@ static inline bool gen8_pd_contains(u64 start, u64 end, int lvl) 
	return (start ^ end) & mask && (start & ~mask) == 0;

}



static inline unsigned int gen8_pt_count(u64 start, u64 end)

static unsigned int gen8_pt_count(u64 start, u64 end)

{

	GEM_BUG_ON(start >= end);

	if ((start ^ end) >> gen8_pd_shift(1))
@@ -142,14 +142,13 @@ static inline unsigned int gen8_pt_count(u64 start, u64 end) 
		return end - start;

}



static inline unsigned int

gen8_pd_top_count(const struct i915_address_space *vm)

static unsigned int gen8_pd_top_count(const struct i915_address_space *vm)

{

	unsigned int shift = __gen8_pte_shift(vm->top);

	return (vm->total + (1ull << shift) - 1) >> shift;

}



static inline struct i915_page_directory *

static struct i915_page_directory *

gen8_pdp_for_page_index(struct i915_address_space * const vm, const u64 idx)

{

	struct i915_ppgtt * const ppgtt = i915_vm_to_ppgtt(vm);
@@ -160,7 +159,7 @@ gen8_pdp_for_page_index(struct i915_address_space * const vm, const u64 idx) 
		return i915_pd_entry(ppgtt->pd, gen8_pd_index(idx, vm->top));

}



static inline struct i915_page_directory *

static struct i915_page_directory *

gen8_pdp_for_page_address(struct i915_address_space * const vm, const u64 addr)

{

	return gen8_pdp_for_page_index(vm, addr >> GEN8_PTE_SHIFT);

drivers/gpu/drm/i915/gt/intel_engine_pm.c

+6 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int __engine_unpark(struct intel_wakeref *wf) 


#if IS_ENABLED(CONFIG_LOCKDEP)



static inline unsigned long __timeline_mark_lock(struct intel_context *ce)

static unsigned long __timeline_mark_lock(struct intel_context *ce)

{

	unsigned long flags;
@@ -89,7 +89,7 @@ static inline unsigned long __timeline_mark_lock(struct intel_context *ce) 
	return flags;

}



static inline void __timeline_mark_unlock(struct intel_context *ce,

static void __timeline_mark_unlock(struct intel_context *ce,

				   unsigned long flags)

{

	mutex_release(&ce->timeline->mutex.dep_map, _THIS_IP_);
@@ -98,12 +98,12 @@ static inline void __timeline_mark_unlock(struct intel_context *ce, 


#else



static inline unsigned long __timeline_mark_lock(struct intel_context *ce)

static unsigned long __timeline_mark_lock(struct intel_context *ce)

{

	return 0;

}



static inline void __timeline_mark_unlock(struct intel_context *ce,

static void __timeline_mark_unlock(struct intel_context *ce,

				   unsigned long flags)

{

}