Commit 6d5de327 authored by Simona Vetter's avatar Simona Vetter
Browse files

drm/i915: Check for nomodeset in i915_init() first 



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.

Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727121037.2041102-1-daniel.vetter@ffwll.ch
parent e43c5261

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,9 +1258,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 },