Skip to content

Commit 7ce1953

Browse files
committed
drm/fb-helper: Always initialize generic fbdev emulation
Initialize the generic fbdev emulation even if it has been disabled on the kernel command line. The hotplug and mode initialization will fail accordingly. The kernel parameter can still be changed at runtime and the emulation will initialize after hotplugging the connector. Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 93e81e3 commit 7ce1953

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

drivers/gpu/drm/drm_fb_helper.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,6 @@ int drm_fb_helper_init(struct drm_device *dev,
526526
{
527527
int ret;
528528

529-
if (!drm_fbdev_emulation) {
530-
dev->fb_helper = fb_helper;
531-
return 0;
532-
}
533-
534529
/*
535530
* If this is not the generic fbdev client, initialize a drm_client
536531
* without callbacks so we can use the modesets.
@@ -2716,9 +2711,6 @@ void drm_fbdev_generic_setup(struct drm_device *dev,
27162711
drm_WARN(dev, !dev->registered, "Device has not been registered.\n");
27172712
drm_WARN(dev, dev->fb_helper, "fb_helper is already set!\n");
27182713

2719-
if (!drm_fbdev_emulation)
2720-
return;
2721-
27222714
fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
27232715
if (!fb_helper) {
27242716
drm_err(dev, "Failed to allocate fb_helper\n");

0 commit comments

Comments
 (0)