diff options
| author | Noralf Trønnes <noralf@tronnes.org> | 2019-04-01 17:13:58 +0300 |
|---|---|---|
| committer | Noralf Trønnes <noralf@tronnes.org> | 2019-04-03 12:11:47 +0300 |
| commit | 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9 (patch) | |
| tree | ac1f17457078f45852ed2faf9ad8f167417360f4 | |
| parent | d7f9b83913f12b918906b8c1f4a4b90b5f4347d3 (diff) | |
| download | linux-6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9.tar.xz | |
drm/fb-helper: generic: Call drm_client_add() after setup is done
Hotplug can happen while drm_fbdev_generic_setup() is running so move
drm_client_add() call after setup is done to avoid
drm_fbdev_client_hotplug() running in two threads at the same time.
Fixes: 9060d7f49376 ("drm/fb-helper: Finish the generic fbdev emulation")
Cc: stable@vger.kernel.org
Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401141358.25309-1-noralf@tronnes.org
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0d8384e30e16..84791dd4a90d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -3312,8 +3312,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp) return ret; } - drm_client_add(&fb_helper->client); - if (!preferred_bpp) preferred_bpp = dev->mode_config.preferred_depth; if (!preferred_bpp) @@ -3324,6 +3322,8 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp) if (ret) DRM_DEV_DEBUG(dev->dev, "client hotplug ret=%d\n", ret); + drm_client_add(&fb_helper->client); + return 0; } EXPORT_SYMBOL(drm_fbdev_generic_setup); |