summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-01-28 02:30:47 +0000
committerjsg <jsg@openbsd.org>2020-01-28 02:30:47 +0000
commit456f152435c3eed600ab7dbf5616d34d081729e9 (patch)
treeff919978ce92f964cd9783c1774317cfbd23c059
parentdrm/fb-helper: generic: Fix setup error path (diff)
downloadwireguard-openbsd-456f152435c3eed600ab7dbf5616d34d081729e9.tar.xz
wireguard-openbsd-456f152435c3eed600ab7dbf5616d34d081729e9.zip
drm/fb-helper: generic: Call drm_client_add() after setup is done
From Noralf Tronnes 6c5df6f63e8f98fe89c41c879385105bd0952248 in linux 4.19.y/4.19.99 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9 in mainline linux
-rw-r--r--sys/dev/pci/drm/drm_fb_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c
index 9a67ab46101..90cba88a69a 100644
--- a/sys/dev/pci/drm/drm_fb_helper.c
+++ b/sys/dev/pci/drm/drm_fb_helper.c
@@ -3322,8 +3322,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)
@@ -3332,6 +3330,8 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
drm_fbdev_client_hotplug(&fb_helper->client);
+ drm_client_add(&fb_helper->client);
+
return 0;
}
EXPORT_SYMBOL(drm_fbdev_generic_setup);