github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: move gem_context slab to direct module init/exit

Browse Source 
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.

v2: Make slab static (Jason, 0day)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727121037.2041102-5-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2021-07-27 14:10:31 +02:00
parent 2dcec7d3fe
commit a6270d1d4c
5 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/gem/i915_gem_context.c
View File

@ -78,25 +78,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;
static struct kmem_cache *slab_luts;
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)
@ -2283,21 +2279,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;
}

3
drivers/gpu/drm/i915/gem/i915_gem_context.h
View File

@ -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);

2
drivers/gpu/drm/i915/i915_globals.c
View File

@ -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,

1
drivers/gpu/drm/i915/i915_globals.h
View File

@ -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);

2
drivers/gpu/drm/i915/i915_pci.c
View File

@ -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"
@ -1265,6 +1266,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 },