iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: move vma 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_vmas to just a
slab_vmas.

We have to keep i915_drv.h include in i915_globals otherwise there's
nothing anymore that pulls in GEM_BUG_ON.

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-9-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2021-07-27 14:10:35 +02:00
parent 210a0f5ce4
commit 64fc7cc71c
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
#include <linux/workqueue.h>
#include "i915_globals.h"
#include "i915_vma.h"
#include "i915_drv.h"
static LIST_HEAD(globals);
@ -28,7 +28,6 @@ static void __i915_globals_cleanup(void)
}
static __initconst int (* const initfn[])(void) = {
i915_global_vma_init,
};
int __init i915_globals_init(void)

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

@ -22,7 +22,4 @@ void i915_global_register(struct i915_global *global);
int i915_globals_init(void);
void i915_globals_exit(void);
/* constructors */
int i915_global_vma_init(void);
#endif /* _I915_GLOBALS_H_ */

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

@ -40,6 +40,7 @@
#include "i915_globals.h"
#include "i915_selftest.h"
#include "i915_scheduler.h"
#include "i915_vma.h"
#define PLATFORM(x) .platform = (x)
#define GEN(x) \
@ -1272,6 +1273,7 @@ static const struct {
{ i915_objects_module_init, i915_objects_module_exit },
{ i915_request_module_init, i915_request_module_exit },
{ i915_scheduler_module_init, i915_scheduler_module_exit },
{ i915_vma_module_init, i915_vma_module_exit },
{ i915_globals_init, i915_globals_exit },
{ i915_mock_selftests, NULL },
{ i915_pmu_init, i915_pmu_exit },

25
drivers/gpu/drm/i915/i915_vma.c
View File

@ -34,24 +34,20 @@
#include "gt/intel_gt_requests.h"
#include "i915_drv.h"
#include "i915_globals.h"
#include "i915_sw_fence_work.h"
#include "i915_trace.h"
#include "i915_vma.h"
static struct i915_global_vma {
struct i915_global base;
struct kmem_cache *slab_vmas;
} global;
static struct kmem_cache *slab_vmas;
struct i915_vma *i915_vma_alloc(void)
{
return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
return kmem_cache_zalloc(slab_vmas, GFP_KERNEL);
}
void i915_vma_free(struct i915_vma *vma)
{
return kmem_cache_free(global.slab_vmas, vma);
return kmem_cache_free(slab_vmas, vma);
}
#if IS_ENABLED(CONFIG_DRM_I915_ERRLOG_GEM) && IS_ENABLED(CONFIG_DRM_DEBUG_MM)
@ -1414,21 +1410,16 @@ void i915_vma_make_purgeable(struct i915_vma *vma)
#include "selftests/i915_vma.c"
#endif
static void i915_global_vma_exit(void)
void i915_vma_module_exit(void)
{
kmem_cache_destroy(global.slab_vmas);
kmem_cache_destroy(slab_vmas);
}
static struct i915_global_vma global = { {
.exit = i915_global_vma_exit,
} };
int __init i915_global_vma_init(void)
int __init i915_vma_module_init(void)
{
global.slab_vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
if (!global.slab_vmas)
slab_vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
if (!slab_vmas)
return -ENOMEM;
i915_global_register(&global.base);
return 0;
}

3
drivers/gpu/drm/i915/i915_vma.h
View File

@ -426,4 +426,7 @@ static inline int i915_vma_sync(struct i915_vma *vma)
return i915_active_wait(&vma->active);
}
void i915_vma_module_exit(void);
int i915_vma_module_init(void);
#endif