Commit 6b711386 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/gt: rename DBG() to GTT_TRACE() 



intel_gtt.h is indirectly included absolutely everywhere in the
driver. DBG() is too short a name. Rename it GTT_TRACE() after
GEM_TRACE().

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230911123305.1682554-1-jani.nikula@intel.com
parent 30c220a6

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

+18 −18
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm, 
	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);



	len = gen8_pd_range(start, end, lvl--, &idx);

	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

	GTT_TRACE("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

		  __func__, vm, lvl + 1, start, end,

		  idx, len, atomic_read(px_used(pd)));

	GEM_BUG_ON(!len || len >= atomic_read(px_used(pd)));
@@ -252,7 +252,7 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm, 


		if (atomic_fetch_inc(&pt->used) >> gen8_pd_shift(1) &&

		    gen8_pd_contains(start, end, lvl)) {

			DBG("%s(%p):{ lvl:%d, idx:%d, start:%llx, end:%llx } removing pd\n",

			GTT_TRACE("%s(%p):{ lvl:%d, idx:%d, start:%llx, end:%llx } removing pd\n",

				  __func__, vm, lvl + 1, idx, start, end);

			clear_pd_entry(pd, idx, scratch);

			__gen8_ppgtt_cleanup(vm, as_pd(pt), I915_PDES, lvl);
@@ -270,7 +270,7 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm, 
			u64 *vaddr;



			count = gen8_pt_count(start, end);

			DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } removing pte\n",

			GTT_TRACE("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } removing pte\n",

				  __func__, vm, lvl, start, end,

				  gen8_pd_index(start, 0), count,

				  atomic_read(&pt->used));
@@ -325,7 +325,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm, 
	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);



	len = gen8_pd_range(*start, end, lvl--, &idx);

	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

	GTT_TRACE("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

		  __func__, vm, lvl + 1, *start, end,

		  idx, len, atomic_read(px_used(pd)));

	GEM_BUG_ON(!len || (idx + len - 1) >> gen8_pd_shift(1));
@@ -338,7 +338,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm, 
		if (!pt) {

			spin_unlock(&pd->lock);



			DBG("%s(%p):{ lvl:%d, idx:%d } allocating new tree\n",

			GTT_TRACE("%s(%p):{ lvl:%d, idx:%d } allocating new tree\n",

				  __func__, vm, lvl + 1, idx);



			pt = stash->pt[!!lvl];
@@ -369,7 +369,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm, 
		} else {

			unsigned int count = gen8_pt_count(*start, end);



			DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } inserting pte\n",

			GTT_TRACE("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } inserting pte\n",

				  __func__, vm, lvl, *start, end,

				  gen8_pd_index(*start, 0), count,

				  atomic_read(&pt->used));

drivers/gpu/drm/i915/gt/intel_gtt.h

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
#define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)



#if IS_ENABLED(CONFIG_DRM_I915_TRACE_GTT)

#define DBG(...) trace_printk(__VA_ARGS__)

#define GTT_TRACE(...) trace_printk(__VA_ARGS__)

#else

#define DBG(...)

#define GTT_TRACE(...)

#endif



#define NALLOC 3 /* 1 normal, 1 for concurrent threads, 1 for preallocation */