diff mbox series

[10/10] drm/i915: Remove i915_globals

Message ID 20210723192934.1004427-10-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show
Series [01/10] drm/i915: Check for nomodeset in i915_init() first | expand

Commit Message

Daniel Vetter July 23, 2021, 7:29 p.m. UTC 
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

Comments

Jason Ekstrand July 26, 2021, 3:51 p.m. UTC | #1 
On Fri, Jul 23, 2021 at 2:29 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> No longer used.
>
> Cc: Jason Ekstrand <jason@jlekstrand.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

But, also, tvrtko is right that dumping all that stuff in i915_pci.c
isn't great.  Mind typing a quick follow-on that moves i915_init/exit
to i915_drv.c?

--Jason

> ---
>  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
>
Daniel Vetter July 27, 2021, 11:34 a.m. UTC | #2 
On Mon, Jul 26, 2021 at 10:51:26AM -0500, Jason Ekstrand wrote:
> On Fri, Jul 23, 2021 at 2:29 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> >
> > No longer used.
> >
> > Cc: Jason Ekstrand <jason@jlekstrand.net>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
> 
> But, also, tvrtko is right that dumping all that stuff in i915_pci.c
> isn't great.  Mind typing a quick follow-on that moves i915_init/exit
> to i915_drv.c?

I think if we want it a new i915_module.c for the module stuff makes more
sense. And leaving the pci driver in i915_pci.c. At least imo i915_drv is
about the drm_driver instance ...

I'll see what it looks like for v2.
-Daniel

> 
> --Jason
> 
> > ---
> >  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
> >
diff mbox series

Patch

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