diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 18:04:08 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:12:50 +0300 |
| commit | f79b43986c74aeebe7e10f715fd6c7f7bd0083fe (patch) | |
| tree | 93f733a7c63f065c2a0d30d8eec9cc2a407ed16e /drivers/gpu/drm | |
| parent | 78c80da7eadbece78c04262a77e554a9ef6f7fba (diff) | |
| download | linux-f79b43986c74aeebe7e10f715fd6c7f7bd0083fe.tar.gz | |
drm/fbdev: Fix seamless boot regression
Commit 7c880188c710 ("drm/client: Send hotplug event after registering a
client") introduced in v6.1.40 broke the seamless boot after the stable
updates were merged into the integration tree.
The root cause is a conflicting commit 8ab59da26bc0 ("drm/fb-helper:
Move generic fbdev emulation into separate source file") from v6.2,
which is also present in amd-staging-drm-next branch. This moved
drm_fbdev_generic_setup() into a different file, but the function was
supposed to be altered by the other patch, hence the changes were not
applied during the merge conflict resolution.
Fix the issue by adding the missing changes to the moved function.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/drm_fbdev_generic.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c index ab8695669279..ad2fcbf9148e 100644 --- a/drivers/gpu/drm/drm_fbdev_generic.c +++ b/drivers/gpu/drm/drm_fbdev_generic.c @@ -485,10 +485,6 @@ void drm_fbdev_generic_setup(struct drm_device *dev, preferred_bpp = 32; fb_helper->preferred_bpp = preferred_bpp; - ret = drm_fbdev_client_hotplug(&fb_helper->client); - if (ret) - drm_dbg_kms(dev, "client hotplug ret=%d\n", ret); - drm_client_register(&fb_helper->client); } EXPORT_SYMBOL(drm_fbdev_generic_setup); |