From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [Intel-gfx] [PATCH 09/10] drm/i915: move vma slab to direct module init/exit
Date: Fri, 23 Jul 2021 21:29:33 +0200 [thread overview]
Message-ID: <20210723192934.1004427-9-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20210723192934.1004427-1-daniel.vetter@ffwll.ch>
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.
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/i915_globals.c | 3 +--
drivers/gpu/drm/i915/i915_globals.h | 3 ---
drivers/gpu/drm/i915/i915_pci.c | 2 ++
drivers/gpu/drm/i915/i915_vma.c | 25 ++++++++-----------------
drivers/gpu/drm/i915/i915_vma.h | 3 +++
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
index 8923589057ab..04979789e7be 100644
--- a/drivers/gpu/drm/i915/i915_globals.c
+++ b/drivers/gpu/drm/i915/i915_globals.c
@@ -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)
diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h
index 7a57bce1da05..57d2998bba45 100644
--- a/drivers/gpu/drm/i915/i915_globals.h
+++ b/drivers/gpu/drm/i915/i915_globals.h
@@ -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_ */
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index a44318519977..0affcf33a211 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -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) \
@@ -1306,6 +1307,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 },
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 09a7c47926f7..d094e2016b93 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -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;
+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;
}
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index eca452a9851f..ed69f66c7ab0 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -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
--
2.32.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-23 19:30 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 19:29 [Intel-gfx] [PATCH 01/10] drm/i915: Check for nomodeset in i915_init() first Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] [PATCH 02/10] drm/i915: move i915_active slab to direct module init/exit Daniel Vetter
2021-07-26 15:24 ` Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 03/10] drm/i915: move i915_buddy " Daniel Vetter
2021-07-24 7:38 ` kernel test robot
2021-07-24 7:38 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_blocks can be static kernel test robot
2021-07-26 15:26 ` [Intel-gfx] [PATCH 03/10] drm/i915: move i915_buddy slab to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 04/10] drm/i915: move intel_context " Daniel Vetter
2021-07-24 11:45 ` kernel test robot
2021-07-24 11:45 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_ce can be static kernel test robot
2021-07-26 8:35 ` [Intel-gfx] [PATCH 04/10] drm/i915: move intel_context slab to direct module init/exit Tvrtko Ursulin
2021-07-26 15:30 ` Jason Ekstrand
2021-07-26 15:42 ` Jason Ekstrand
2021-07-26 16:08 ` Tvrtko Ursulin
2021-07-26 16:20 ` Jason Ekstrand
2021-07-26 16:31 ` Tvrtko Ursulin
2021-07-26 18:17 ` Jason Ekstrand
2021-07-27 10:14 ` Tvrtko Ursulin
2021-07-23 19:29 ` [Intel-gfx] [PATCH 05/10] drm/i915: move gem_context " Daniel Vetter
2021-07-24 14:50 ` kernel test robot
2021-07-24 14:50 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_luts can be static kernel test robot
2021-07-26 15:35 ` [Intel-gfx] [PATCH 05/10] drm/i915: move gem_context slab to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 06/10] drm/i915: move gem_objects " Daniel Vetter
2021-07-24 18:23 ` kernel test robot
2021-07-24 18:23 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_objects can be static kernel test robot
2021-07-26 15:39 ` [Intel-gfx] [PATCH 06/10] drm/i915: move gem_objects slab to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 07/10] drm/i915: move request slabs " Daniel Vetter
2021-07-24 21:58 ` kernel test robot
2021-07-24 21:58 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_requests can be static kernel test robot
2021-07-26 15:46 ` [Intel-gfx] [PATCH 07/10] drm/i915: move request slabs to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 08/10] drm/i915: move scheduler " Daniel Vetter
2021-07-25 1:23 ` kernel test robot
2021-07-25 1:23 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_dependencies can be static kernel test robot
2021-07-26 15:47 ` [Intel-gfx] [PATCH 08/10] drm/i915: move scheduler slabs to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` Daniel Vetter [this message]
2021-07-25 4:04 ` [Intel-gfx] [PATCH 09/10] drm/i915: move vma slab " kernel test robot
2021-07-25 4:04 ` [Intel-gfx] [RFC PATCH] drm/i915: slab_vmas can be static kernel test robot
2021-07-26 15:50 ` [Intel-gfx] [PATCH 09/10] drm/i915: move vma slab to direct module init/exit Jason Ekstrand
2021-07-23 19:29 ` [Intel-gfx] [PATCH 10/10] drm/i915: Remove i915_globals Daniel Vetter
2021-07-26 15:51 ` Jason Ekstrand
2021-07-27 11:34 ` Daniel Vetter
2021-07-23 21:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Check for nomodeset in i915_init() first Patchwork
2021-07-23 21:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-07-23 22:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-24 9:00 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-07-26 15:23 ` [Intel-gfx] [PATCH 01/10] " Jason Ekstrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723192934.1004427-9-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).