Commit 09d59f73 authored Dec 03, 2023 by Dmitry Baryshkov Committed by Greg Kroah-Hartman Jan 25, 2024

drm/drv: propagate errors from drm_modeset_register_all()



[ Upstream commit 5f8dec200923a76dc57187965fd59c1136f5d085 ]

In case the drm_modeset_register_all() function fails, its error code
will be ignored. Instead make the drm_dev_register() bail out in case of
such an error.

Fixes: 79190ea2 ("drm: Add callbacks for late registering")
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231202225552.1283638-1-dmitry.baryshkov@linaro.org


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 31b169a8

drivers/gpu/drm/drm_drv.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -984,8 +984,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
		goto err_minors;
		}

		if (drm_core_check_feature(dev, DRIVER_MODESET))
		drm_modeset_register_all(dev);
		if (drm_core_check_feature(dev, DRIVER_MODESET)) {
		ret = drm_modeset_register_all(dev);
		if (ret)
		goto err_unload;
		}

		ret = 0;

		@@ -997,6 +1000,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)

		goto out_unlock;

		err_unload:
		if (dev->driver->unload)
		dev->driver->unload(dev);
		err_minors:
		remove_compat_control_link(dev);
		drm_minor_unregister(dev, DRM_MINOR_PRIMARY);