Unverified Commit b11af8a2 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/connector: Consolidate Connector Initialization 



We're going to add a DRM-managed connector initialization function.
Since we'll need both the with and without the DDC pointer, having a
single function that takes an optional pointer is easier to maintain.

Let's create a static function that will back both existing variants,
and will be reused by the DRM-managed variant.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Suggested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-8-maxime@cerno.tech
parent d87fbea5

drivers/gpu/drm/drm_connector.c

+34 −31
Original line number Diff line number Diff line
@@ -214,27 +214,11 @@ void drm_connector_free_work_fn(struct work_struct *work) 
	}

}



/**

 * drm_connector_init - Init a preallocated connector

 * @dev: DRM device

 * @connector: the connector to init

 * @funcs: callbacks for this connector

 * @connector_type: user visible type of the connector

 *

 * Initialises a preallocated connector. Connectors should be

 * subclassed as part of driver connector objects.

 *

 * At driver unload time the driver's &drm_connector_funcs.destroy hook

 * should call drm_connector_cleanup() and free the connector structure.

 * The connector structure should not be allocated with devm_kzalloc().

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_connector_init(struct drm_device *dev,

static int __drm_connector_init(struct drm_device *dev,

				struct drm_connector *connector,

				const struct drm_connector_funcs *funcs,

		       int connector_type)

				int connector_type,

				struct i2c_adapter *ddc)

{

	struct drm_mode_config *config = &dev->mode_config;

	int ret;
@@ -282,6 +266,9 @@ int drm_connector_init(struct drm_device *dev, 
		goto out_put_type_id;

	}



	/* provide ddc symlink in sysfs */

	connector->ddc = ddc;



	INIT_LIST_HEAD(&connector->global_connector_list_entry);

	INIT_LIST_HEAD(&connector->probed_modes);

	INIT_LIST_HEAD(&connector->modes);
@@ -338,6 +325,31 @@ int drm_connector_init(struct drm_device *dev, 


	return ret;

}



/**

 * drm_connector_init - Init a preallocated connector

 * @dev: DRM device

 * @connector: the connector to init

 * @funcs: callbacks for this connector

 * @connector_type: user visible type of the connector

 *

 * Initialises a preallocated connector. Connectors should be

 * subclassed as part of driver connector objects.

 *

 * At driver unload time the driver's &drm_connector_funcs.destroy hook

 * should call drm_connector_cleanup() and free the connector structure.

 * The connector structure should not be allocated with devm_kzalloc().

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_connector_init(struct drm_device *dev,

		       struct drm_connector *connector,

		       const struct drm_connector_funcs *funcs,

		       int connector_type)

{

	return __drm_connector_init(dev, connector, funcs, connector_type, NULL);

}

EXPORT_SYMBOL(drm_connector_init);



/**
@@ -366,16 +378,7 @@ int drm_connector_init_with_ddc(struct drm_device *dev, 
				int connector_type,

				struct i2c_adapter *ddc)

{

	int ret;



	ret = drm_connector_init(dev, connector, funcs, connector_type);

	if (ret)

		return ret;



	/* provide ddc symlink in sysfs */

	connector->ddc = ddc;



	return ret;

	return __drm_connector_init(dev, connector, funcs, connector_type, ddc);

}

EXPORT_SYMBOL(drm_connector_init_with_ddc);