[PATCH 01/10] drm/i915: Check for nomodeset in i915_init() first

[Daniel Vetter]

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 <ja...@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
---
 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