Commit 74fc5954 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move i915_cache_level_str() static in i915_debugfs.c 



Move the function next to the only user.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dc0901dbe424c21b3e03b875bf5b944b214d1af4.1644507885.git.jani.nikula@intel.com
parent 9a8e720f

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

+0 −11
Original line number Diff line number Diff line
@@ -1230,17 +1230,6 @@ void intel_engine_cancel_stop_cs(struct intel_engine_cs *engine) 
	ENGINE_WRITE_FW(engine, RING_MI_MODE, _MASKED_BIT_DISABLE(STOP_RING));

}



const char *i915_cache_level_str(struct drm_i915_private *i915, int type)

{

	switch (type) {

	case I915_CACHE_NONE: return " uncached";

	case I915_CACHE_LLC: return HAS_LLC(i915) ? " LLC" : " snooped";

	case I915_CACHE_L3_LLC: return " L3+LLC";

	case I915_CACHE_WT: return " WT";

	default: return "";

	}

}



static u32

read_subslice_reg(const struct intel_engine_cs *engine,

		  int slice, int subslice, i915_reg_t reg)

drivers/gpu/drm/i915/i915_debugfs.c

+11 −0
Original line number Diff line number Diff line
@@ -137,6 +137,17 @@ static const char *stringify_vma_type(const struct i915_vma *vma) 
	return "ppgtt";

}



static const char *i915_cache_level_str(struct drm_i915_private *i915, int type)

{

	switch (type) {

	case I915_CACHE_NONE: return " uncached";

	case I915_CACHE_LLC: return HAS_LLC(i915) ? " LLC" : " snooped";

	case I915_CACHE_L3_LLC: return " L3+LLC";

	case I915_CACHE_WT: return " WT";

	default: return "";

	}

}



void

i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)

{

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1641,8 +1641,6 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objec 
		i915_gem_object_is_tiled(obj);

}



const char *i915_cache_level_str(struct drm_i915_private *i915, int type);



/* intel_device_info.c */

static inline struct intel_device_info *

mkwrite_device_info(struct drm_i915_private *dev_priv)