On Fri, Jul 23, 2021 at 2:29 PM Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > > When modesetting (aka the full pci driver, which has nothing to do > with disable_display option, which just gives you the full pci driver > without the display driver) is disabled, we load nothing and do > nothing. > > So move that check first, for a bit of orderliness. With Jason's > module init/exit table this now becomes trivial. > > Cc: Jason Ekstrand <jason@xxxxxxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> Reviewed-by: Jason Ekstrand <jason@xxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 48ea23dd3b5b..0deaeeba2347 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -1292,9 +1292,9 @@ static const struct { > int (*init)(void); > void (*exit)(void); > } init_funcs[] = { > + { i915_check_nomodeset, NULL }, > { i915_globals_init, i915_globals_exit }, > { i915_mock_selftests, NULL }, > - { i915_check_nomodeset, NULL }, > { i915_pmu_init, i915_pmu_exit }, > { i915_register_pci_driver, i915_unregister_pci_driver }, > { i915_perf_sysctl_register, i915_perf_sysctl_unregister }, > -- > 2.32.0 > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx