On Fri, Jul 23, 2021 at 2:29 PM Daniel Vetter daniel.vetter@ffwll.ch wrote:
With the global kmem_cache shrink infrastructure gone there's nothing special and we can convert them over.
I'm doing this split up into each patch because there's quite a bit of noise with removing the static global.slab_luts to just a slab_luts.
Cc: Jason Ekstrand jason@jlekstrand.net Signed-off-by: Daniel Vetter daniel.vetter@intel.com
drivers/gpu/drm/i915/gem/i915_gem_context.c | 25 +++++++-------------- drivers/gpu/drm/i915/gem/i915_gem_context.h | 3 +++ drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_globals.h | 1 - drivers/gpu/drm/i915/i915_pci.c | 2 ++ 5 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 89ca401bf9ae..c17c28af1e57 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -79,25 +79,21 @@ #include "gt/intel_ring.h"
#include "i915_gem_context.h" -#include "i915_globals.h" #include "i915_trace.h" #include "i915_user_extensions.h"
#define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1
-static struct i915_global_gem_context {
struct i915_global base;struct kmem_cache *slab_luts;-} global; +struct kmem_cache *slab_luts;
static.
With that,
Reviewed-by: Jason Ekstrand jason@jlekstrand.net
struct i915_lut_handle *i915_lut_handle_alloc(void) {
return kmem_cache_alloc(global.slab_luts, GFP_KERNEL);
return kmem_cache_alloc(slab_luts, GFP_KERNEL);}
void i915_lut_handle_free(struct i915_lut_handle *lut) {
return kmem_cache_free(global.slab_luts, lut);
return kmem_cache_free(slab_luts, lut);}
static void lut_close(struct i915_gem_context *ctx) @@ -2282,21 +2278,16 @@ i915_gem_engines_iter_next(struct i915_gem_engines_iter *it) #include "selftests/i915_gem_context.c" #endif
-static void i915_global_gem_context_exit(void) +void i915_gem_context_module_exit(void) {
kmem_cache_destroy(global.slab_luts);
kmem_cache_destroy(slab_luts);}
-static struct i915_global_gem_context global = { {
.exit = i915_global_gem_context_exit,-} };
-int __init i915_global_gem_context_init(void) +int __init i915_gem_context_module_init(void) {
global.slab_luts = KMEM_CACHE(i915_lut_handle, 0);if (!global.slab_luts)
slab_luts = KMEM_CACHE(i915_lut_handle, 0);if (!slab_luts) return -ENOMEM;
i915_global_register(&global.base); return 0;} diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h index 20411db84914..18060536b0c2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h @@ -224,6 +224,9 @@ i915_gem_engines_iter_next(struct i915_gem_engines_iter *it); for (i915_gem_engines_iter_init(&(it), (engines)); \ ((ce) = i915_gem_engines_iter_next(&(it)));)
+void i915_gem_context_module_exit(void); +int i915_gem_context_module_init(void);
struct i915_lut_handle *i915_lut_handle_alloc(void); void i915_lut_handle_free(struct i915_lut_handle *lut);
diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index d36eb7dc40aa..dbb3d81eeea7 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -7,7 +7,6 @@ #include <linux/slab.h> #include <linux/workqueue.h>
-#include "gem/i915_gem_object.h" #include "i915_globals.h" #include "i915_request.h" #include "i915_scheduler.h" @@ -31,7 +30,6 @@ static void __i915_globals_cleanup(void) }
static __initconst int (* const initfn[])(void) = {
i915_global_gem_context_init, i915_global_objects_init, i915_global_request_init, i915_global_scheduler_init,diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index 60daa738a188..f16752dbbdbf 100644 --- a/drivers/gpu/drm/i915/i915_globals.h +++ b/drivers/gpu/drm/i915/i915_globals.h @@ -23,7 +23,6 @@ int i915_globals_init(void); void i915_globals_exit(void);
/* constructors */ -int i915_global_gem_context_init(void); int i915_global_objects_init(void); int i915_global_request_init(void); int i915_global_scheduler_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 266618157775..2b56e664d043 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -34,6 +34,7 @@ #include "i915_buddy.h" #include "i915_drv.h" #include "gem/i915_gem_context.h" +#include "gem/i915_gem_object.h" #include "i915_perf.h" #include "i915_globals.h" #include "i915_selftest.h" @@ -1299,6 +1300,7 @@ static const struct { { i915_active_module_init, i915_active_module_exit }, { i915_buddy_module_init, i915_buddy_module_exit }, { i915_context_module_init, i915_context_module_exit },
{ i915_gem_context_module_init, i915_gem_context_module_exit }, { i915_globals_init, i915_globals_exit }, { i915_mock_selftests, NULL }, { i915_pmu_init, i915_pmu_exit },-- 2.32.0