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>,
Jason Ekstrand <jason@jlekstrand.net>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 10/10] drm/i915: Remove i915_globals
Date: Fri, 23 Jul 2021 21:29:34 +0200 [thread overview]
Message-ID: <20210723192934.1004427-10-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20210723192934.1004427-1-daniel.vetter@ffwll.ch>
No longer used.
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 -
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 -
drivers/gpu/drm/i915/i915_globals.c | 53 ---------------------------
drivers/gpu/drm/i915/i915_globals.h | 25 -------------
drivers/gpu/drm/i915/i915_pci.c | 2 -
5 files changed, 82 deletions(-)
delete mode 100644 drivers/gpu/drm/i915/i915_globals.c
delete mode 100644 drivers/gpu/drm/i915/i915_globals.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 10b3bb6207ba..9022dc638ed6 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -166,7 +166,6 @@ i915-y += \
i915_gem_gtt.o \
i915_gem_ww.o \
i915_gem.o \
- i915_globals.o \
i915_query.o \
i915_request.o \
i915_scheduler.o \
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index d86825437516..943c1d416ec0 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -6,7 +6,6 @@
#include <linux/suspend.h>
#include "i915_drv.h"
-#include "i915_globals.h"
#include "i915_params.h"
#include "intel_context.h"
#include "intel_engine_pm.h"
diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
deleted file mode 100644
index 04979789e7be..000000000000
--- a/drivers/gpu/drm/i915/i915_globals.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-
-#include "i915_globals.h"
-#include "i915_drv.h"
-
-static LIST_HEAD(globals);
-
-void __init i915_global_register(struct i915_global *global)
-{
- GEM_BUG_ON(!global->exit);
-
- list_add_tail(&global->link, &globals);
-}
-
-static void __i915_globals_cleanup(void)
-{
- struct i915_global *global, *next;
-
- list_for_each_entry_safe_reverse(global, next, &globals, link)
- global->exit();
-}
-
-static __initconst int (* const initfn[])(void) = {
-};
-
-int __init i915_globals_init(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(initfn); i++) {
- int err;
-
- err = initfn[i]();
- if (err) {
- __i915_globals_cleanup();
- return err;
- }
- }
-
- return 0;
-}
-
-void i915_globals_exit(void)
-{
- __i915_globals_cleanup();
-}
diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h
deleted file mode 100644
index 57d2998bba45..000000000000
--- a/drivers/gpu/drm/i915/i915_globals.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#ifndef _I915_GLOBALS_H_
-#define _I915_GLOBALS_H_
-
-#include <linux/types.h>
-
-typedef void (*i915_global_func_t)(void);
-
-struct i915_global {
- struct list_head link;
-
- i915_global_func_t exit;
-};
-
-void i915_global_register(struct i915_global *global);
-
-int i915_globals_init(void);
-void i915_globals_exit(void);
-
-#endif /* _I915_GLOBALS_H_ */
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 0affcf33a211..ed72bcb58331 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -37,7 +37,6 @@
#include "gem/i915_gem_object.h"
#include "i915_request.h"
#include "i915_perf.h"
-#include "i915_globals.h"
#include "i915_selftest.h"
#include "i915_scheduler.h"
#include "i915_vma.h"
@@ -1308,7 +1307,6 @@ static const struct {
{ 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 },
{ i915_register_pci_driver, i915_unregister_pci_driver },
--
2.32.0
WARNING: multiple messages have this Message-ID (diff)
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 10/10] drm/i915: Remove i915_globals
Date: Fri, 23 Jul 2021 21:29:34 +0200 [thread overview]
Message-ID: <20210723192934.1004427-10-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20210723192934.1004427-1-daniel.vetter@ffwll.ch>
No longer used.
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 -
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 -
drivers/gpu/drm/i915/i915_globals.c | 53 ---------------------------
drivers/gpu/drm/i915/i915_globals.h | 25 -------------
drivers/gpu/drm/i915/i915_pci.c | 2 -
5 files changed, 82 deletions(-)
delete mode 100644 drivers/gpu/drm/i915/i915_globals.c
delete mode 100644 drivers/gpu/drm/i915/i915_globals.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 10b3bb6207ba..9022dc638ed6 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -166,7 +166,6 @@ i915-y += \
i915_gem_gtt.o \
i915_gem_ww.o \
i915_gem.o \
- i915_globals.o \
i915_query.o \
i915_request.o \
i915_scheduler.o \
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index d86825437516..943c1d416ec0 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -6,7 +6,6 @@
#include <linux/suspend.h>
#include "i915_drv.h"
-#include "i915_globals.h"
#include "i915_params.h"
#include "intel_context.h"
#include "intel_engine_pm.h"
diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
deleted file mode 100644
index 04979789e7be..000000000000
--- a/drivers/gpu/drm/i915/i915_globals.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-
-#include "i915_globals.h"
-#include "i915_drv.h"
-
-static LIST_HEAD(globals);
-
-void __init i915_global_register(struct i915_global *global)
-{
- GEM_BUG_ON(!global->exit);
-
- list_add_tail(&global->link, &globals);
-}
-
-static void __i915_globals_cleanup(void)
-{
- struct i915_global *global, *next;
-
- list_for_each_entry_safe_reverse(global, next, &globals, link)
- global->exit();
-}
-
-static __initconst int (* const initfn[])(void) = {
-};
-
-int __init i915_globals_init(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(initfn); i++) {
- int err;
-
- err = initfn[i]();
- if (err) {
- __i915_globals_cleanup();
- return err;
- }
- }
-
- return 0;
-}
-
-void i915_globals_exit(void)
-{
- __i915_globals_cleanup();
-}
diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h
deleted file mode 100644
index 57d2998bba45..000000000000
--- a/drivers/gpu/drm/i915/i915_globals.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#ifndef _I915_GLOBALS_H_
-#define _I915_GLOBALS_H_
-
-#include <linux/types.h>
-
-typedef void (*i915_global_func_t)(void);
-
-struct i915_global {
- struct list_head link;
-
- i915_global_func_t exit;
-};
-
-void i915_global_register(struct i915_global *global);
-
-int i915_globals_init(void);
-void i915_globals_exit(void);
-
-#endif /* _I915_GLOBALS_H_ */
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 0affcf33a211..ed72bcb58331 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -37,7 +37,6 @@
#include "gem/i915_gem_object.h"
#include "i915_request.h"
#include "i915_perf.h"
-#include "i915_globals.h"
#include "i915_selftest.h"
#include "i915_scheduler.h"
#include "i915_vma.h"
@@ -1308,7 +1307,6 @@ static const struct {
{ 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 },
{ i915_register_pci_driver, i915_unregister_pci_driver },
--
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: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 19:29 [PATCH 01/10] drm/i915: Check for nomodeset in i915_init() first Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-23 19:29 ` [PATCH 02/10] drm/i915: move i915_active slab to direct module init/exit Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-26 15:24 ` Jason Ekstrand
2021-07-26 15:24 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 03/10] drm/i915: move i915_buddy " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-24 7:38 ` kernel test robot
2021-07-24 7:38 ` kernel test robot
2021-07-24 7:38 ` kernel test robot
2021-07-24 7:38 ` [RFC PATCH] drm/i915: slab_blocks can be static kernel test robot
2021-07-24 7:38 ` kernel test robot
2021-07-24 7:38 ` [Intel-gfx] " kernel test robot
2021-07-26 15:26 ` [PATCH 03/10] drm/i915: move i915_buddy slab to direct module init/exit Jason Ekstrand
2021-07-26 15:26 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 04/10] drm/i915: move intel_context " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-24 11:45 ` kernel test robot
2021-07-24 11:45 ` kernel test robot
2021-07-24 11:45 ` kernel test robot
2021-07-24 11:45 ` [RFC PATCH] drm/i915: slab_ce can be static kernel test robot
2021-07-24 11:45 ` kernel test robot
2021-07-24 11:45 ` [Intel-gfx] " 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 8:35 ` Tvrtko Ursulin
2021-07-26 15:30 ` Jason Ekstrand
2021-07-26 15:30 ` Jason Ekstrand
2021-07-26 15:42 ` Jason Ekstrand
2021-07-26 15:42 ` Jason Ekstrand
2021-07-26 16:08 ` Tvrtko Ursulin
2021-07-26 16:08 ` Tvrtko Ursulin
2021-07-26 16:20 ` Jason Ekstrand
2021-07-26 16:20 ` Jason Ekstrand
2021-07-26 16:31 ` Tvrtko Ursulin
2021-07-26 16:31 ` Tvrtko Ursulin
2021-07-26 18:17 ` Jason Ekstrand
2021-07-26 18:17 ` Jason Ekstrand
2021-07-27 10:14 ` Tvrtko Ursulin
2021-07-27 10:14 ` Tvrtko Ursulin
2021-07-23 19:29 ` [PATCH 05/10] drm/i915: move gem_context " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-24 14:50 ` kernel test robot
2021-07-24 14:50 ` kernel test robot
2021-07-24 14:50 ` kernel test robot
2021-07-24 14:50 ` [RFC PATCH] drm/i915: slab_luts can be static kernel test robot
2021-07-24 14:50 ` kernel test robot
2021-07-24 14:50 ` [Intel-gfx] " kernel test robot
2021-07-26 15:35 ` [PATCH 05/10] drm/i915: move gem_context slab to direct module init/exit Jason Ekstrand
2021-07-26 15:35 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 06/10] drm/i915: move gem_objects " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-24 18:23 ` kernel test robot
2021-07-24 18:23 ` kernel test robot
2021-07-24 18:23 ` kernel test robot
2021-07-24 18:23 ` [RFC PATCH] drm/i915: slab_objects can be static kernel test robot
2021-07-24 18:23 ` kernel test robot
2021-07-24 18:23 ` [Intel-gfx] " kernel test robot
2021-07-26 15:39 ` [PATCH 06/10] drm/i915: move gem_objects slab to direct module init/exit Jason Ekstrand
2021-07-26 15:39 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 07/10] drm/i915: move request slabs " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-24 21:58 ` kernel test robot
2021-07-24 21:58 ` kernel test robot
2021-07-24 21:58 ` [Intel-gfx] " kernel test robot
2021-07-24 21:58 ` [RFC PATCH] drm/i915: slab_requests can be static kernel test robot
2021-07-24 21:58 ` kernel test robot
2021-07-24 21:58 ` [Intel-gfx] " kernel test robot
2021-07-26 15:46 ` [PATCH 07/10] drm/i915: move request slabs to direct module init/exit Jason Ekstrand
2021-07-26 15:46 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 08/10] drm/i915: move scheduler " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-25 1:23 ` kernel test robot
2021-07-25 1:23 ` kernel test robot
2021-07-25 1:23 ` kernel test robot
2021-07-25 1:23 ` [RFC PATCH] drm/i915: slab_dependencies can be static kernel test robot
2021-07-25 1:23 ` kernel test robot
2021-07-25 1:23 ` [Intel-gfx] " kernel test robot
2021-07-26 15:47 ` [PATCH 08/10] drm/i915: move scheduler slabs to direct module init/exit Jason Ekstrand
2021-07-26 15:47 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` [PATCH 09/10] drm/i915: move vma slab " Daniel Vetter
2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter
2021-07-25 4:04 ` kernel test robot
2021-07-25 4:04 ` kernel test robot
2021-07-25 4:04 ` [Intel-gfx] " kernel test robot
2021-07-25 4:04 ` [RFC PATCH] drm/i915: slab_vmas can be static kernel test robot
2021-07-25 4:04 ` kernel test robot
2021-07-25 4:04 ` [Intel-gfx] " kernel test robot
2021-07-26 15:50 ` [PATCH 09/10] drm/i915: move vma slab to direct module init/exit Jason Ekstrand
2021-07-26 15:50 ` [Intel-gfx] " Jason Ekstrand
2021-07-23 19:29 ` Daniel Vetter [this message]
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-26 15:51 ` [Intel-gfx] " Jason Ekstrand
2021-07-27 11:34 ` Daniel Vetter
2021-07-27 11:34 ` [Intel-gfx] " 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 ` [PATCH 01/10] " Jason Ekstrand
2021-07-26 15:23 ` [Intel-gfx] " 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-10-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 \
--cc=jason@jlekstrand.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.