]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe/fbdev: put intel_fbdev_fb_prefer_stolen() behind IS_ENABLED(CONFIG_DRM_FBDEV_E...
authorJani Nikula <jani.nikula@intel.com>
Tue, 31 Mar 2026 09:49:14 +0000 (12:49 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 2 Apr 2026 07:19:57 +0000 (10:19 +0300)
Unify the behaviour with i915. Similar to commit b63c6b9b7f5e
("drm/i915/fbdev: fix link failure without FBDEV emulation"). The
difference is that unlike i915, xe doesn't build
display/intel_fbdev_fb.c conditional to CONFIG_DRM_FBDEV_EMULATION.

Reviewed-by: MichaƂ Grzelak <michal.grzelak@intel.com>
Link: https://patch.msgid.link/245880a591fe5267a1c06bfbbcc42a4dd9f2e4ee.1774950508.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/xe/display/xe_initial_plane.c

index 8bcae552dddcf63bdb7eb40ab8465e419dde21e9..d44746f4966c02b7bb786bd29ad54a6eb0440db2 100644 (file)
@@ -86,6 +86,7 @@ initial_plane_bo(struct xe_device *xe,
                flags |= XE_BO_FLAG_STOLEN;
 
                if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
+                   IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) &&
                    !intel_fbdev_fb_prefer_stolen(&xe->drm, plane_config->size)) {
                        drm_info(&xe->drm, "Initial FB size exceeds half of stolen, discarding\n");
                        return NULL;