Commit 9285f09e authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Fail if connector initialization fails 



Update the connector code to fail if the connector could not be
initialized. The current code just ignored the error and failed
later when the connector was supposed to be used.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220207141544.30015-2-tzimmermann@suse.de
parent e09b9aef

drivers/gpu/drm/ast/ast_mode.c

+8 −5
Original line number Diff line number Diff line
@@ -1322,18 +1322,21 @@ static int ast_connector_init(struct drm_device *dev) 
	struct ast_connector *ast_connector = &ast->connector;

	struct drm_connector *connector = &ast_connector->base;

	struct drm_encoder *encoder = &ast->encoder;

	int ret;



	ast_connector->i2c = ast_i2c_create(dev);

	if (!ast_connector->i2c)

		drm_err(dev, "failed to add ddc bus for connector\n");



	if (ast_connector->i2c)

		drm_connector_init_with_ddc(dev, connector, &ast_connector_funcs,

		ret = drm_connector_init_with_ddc(dev, connector, &ast_connector_funcs,

						  DRM_MODE_CONNECTOR_VGA,

						  &ast_connector->i2c->adapter);

	else

		drm_connector_init(dev, connector, &ast_connector_funcs,

		ret = drm_connector_init(dev, connector, &ast_connector_funcs,

					 DRM_MODE_CONNECTOR_VGA);

	if (ret)

		return ret;



	drm_connector_helper_add(connector, &ast_connector_helper_funcs);