]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/fbdev: fix link failure without FBDEV emulation
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2026 08:36:48 +0000 (09:36 +0100)
committerJani Nikula <jani.nikula@intel.com>
Wed, 18 Mar 2026 11:23:27 +0000 (13:23 +0200)
If CONFIG_DRM_FBDEV_EMULATION is disabled but CONFIG_FRAMEBUFFER_CONSOLE
is turned on, the i915 driver now fails to link:

ERROR: modpost: "intel_fbdev_fb_prefer_stolen" [drivers/gpu/drm/i915/i915.ko] undefined!

Fix the contition to include a check for the symbol that controls compilation
of intel_fbdev_fb.c.

Fixes: 94c7d2861292 ("drm/i915/fbdev: Extract intel_fbdev_fb_prefer_stolen()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20260304083701.724908-1-arnd@kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_initial_plane.c

index 5594548f51d827d7a08ec109568165baa1af5ec1..390a9248d6314208a5653344de9218c7e705344a 100644 (file)
@@ -115,7 +115,8 @@ initial_plane_vma(struct drm_i915_private *i915,
         * important and we should probably use that space with FBC or other
         * features.
         */
-       if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
+       if (IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) &&
+           IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
            mem == i915->mm.stolen_region &&
            !intel_fbdev_fb_prefer_stolen(&i915->drm, size)) {
                drm_dbg_kms(&i915->drm, "Initial FB size exceeds half of stolen, discarding\n");