Commit 4f62a7e0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Ditch i915 globals shrink infrastructure 



This essentially reverts

commit 84a10749
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Jan 24 11:36:08 2018 +0000

    drm/i915: Shrink the GEM kmem_caches upon idling

mm/vmscan.c:do_shrink_slab() is a thing, if there's an issue with it
then we need to fix that there, not hand-roll our own slab shrinking
code in i915.

Also when this was added there was only one other caller of
kmem_cache_shrink (added 2005 to the acpi code). Now there's a 2nd one
outside of i915 code in a kunit test, which seems legit since that
wants to very carefully control what's in the kmem_cache. This out of
a total of over 500 calls to kmem_cache_create. This alone should have
been warning sign enough that we're doing something silly.

Noticed while reviewing a patch set from Jason to fix up some issues
in our i915_init() and i915_exit() module load/cleanup code. Now that
i915_globals.c isn't any different than normal init/exit functions, we
should convert them over to one unified table and remove
i915_globals.[hc] entirely.

v2: Improve commit message (Jason)

Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721183229.4136488-1-daniel.vetter@ffwll.ch
parent 6b73a7f3

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

+0 −6
Original line number Diff line number Diff line
@@ -2280,18 +2280,12 @@ i915_gem_engines_iter_next(struct i915_gem_engines_iter *it) 
#include "selftests/i915_gem_context.c"

#endif



static void i915_global_gem_context_shrink(void)

{

	kmem_cache_shrink(global.slab_luts);

}



static void i915_global_gem_context_exit(void)

{

	kmem_cache_destroy(global.slab_luts);

}



static struct i915_global_gem_context global = { {

	.shrink = i915_global_gem_context_shrink,

	.exit = i915_global_gem_context_exit,

} };

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

+0 −6
Original line number Diff line number Diff line
@@ -664,18 +664,12 @@ void i915_gem_init__objects(struct drm_i915_private *i915) 
	INIT_WORK(&i915->mm.free_work, __i915_gem_free_work);

}



static void i915_global_objects_shrink(void)

{

	kmem_cache_shrink(global.slab_objects);

}



static void i915_global_objects_exit(void)

{

	kmem_cache_destroy(global.slab_objects);

}



static struct i915_global_object global = { {

	.shrink = i915_global_objects_shrink,

	.exit = i915_global_objects_exit,

} };

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

+0 −6
Original line number Diff line number Diff line
@@ -398,18 +398,12 @@ void intel_context_fini(struct intel_context *ce) 
	i915_active_fini(&ce->active);

}



static void i915_global_context_shrink(void)

{

	kmem_cache_shrink(global.slab_ce);

}



static void i915_global_context_exit(void)

{

	kmem_cache_destroy(global.slab_ce);

}



static struct i915_global_context global = { {

	.shrink = i915_global_context_shrink,

	.exit = i915_global_context_exit,

} };

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

+0 −4
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ static int __gt_unpark(struct intel_wakeref *wf) 


	GT_TRACE(gt, "\n");



	i915_globals_unpark();



	/*

	 * It seems that the DMC likes to transition between the DC states a lot

	 * when there are no connected displays (no active power domains) during
@@ -116,8 +114,6 @@ static int __gt_park(struct intel_wakeref *wf) 
	GEM_BUG_ON(!wakeref);

	intel_display_power_put_async(i915, POWER_DOMAIN_GT_IRQ, wakeref);



	i915_globals_park();



	return 0;

}

drivers/gpu/drm/i915/i915_active.c

+0 −6
Original line number Diff line number Diff line
@@ -1176,18 +1176,12 @@ struct i915_active *i915_active_create(void) 
#include "selftests/i915_active.c"

#endif



static void i915_global_active_shrink(void)

{

	kmem_cache_shrink(global.slab_cache);

}



static void i915_global_active_exit(void)

{

	kmem_cache_destroy(global.slab_cache);

}



static struct i915_global_active global = { {

	.shrink = i915_global_active_shrink,

	.exit = i915_global_active_exit,

} };