Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b8b2ed authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter
Browse files

drm/fb-helper: Reshuffle code for subsequent patches 



An unlocked version of the drm_fb_helper_add_one_connector() function
will be added in a subsequent patch. Reshuffle the code separately to
make the diff more readable later on.

Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170329144401.1804-3-thierry.reding@gmail.com
parent 4b4f99f5

drivers/gpu/drm/drm_fb_helper.c

+29 −30
Original line number Diff line number Diff line
@@ -109,6 +109,35 @@ static DEFINE_MUTEX(kernel_fb_helper_lock); 
	for (({ lockdep_assert_held(&(fbh)->dev->mode_config.mutex); }), \

	     i__ = 0; i__ < (fbh)->connector_count; i__++)



int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector)

{

	struct drm_fb_helper_connector **temp;

	struct drm_fb_helper_connector *fb_helper_connector;



	if (!drm_fbdev_emulation)

		return 0;



	WARN_ON(!mutex_is_locked(&fb_helper->dev->mode_config.mutex));

	if (fb_helper->connector_count + 1 > fb_helper->connector_info_alloc_count) {

		temp = krealloc(fb_helper->connector_info, sizeof(struct drm_fb_helper_connector *) * (fb_helper->connector_count + 1), GFP_KERNEL);

		if (!temp)

			return -ENOMEM;



		fb_helper->connector_info_alloc_count = fb_helper->connector_count + 1;

		fb_helper->connector_info = temp;

	}



	fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), GFP_KERNEL);

	if (!fb_helper_connector)

		return -ENOMEM;



	drm_connector_get(connector);

	fb_helper_connector->connector = connector;

	fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;

	return 0;

}

EXPORT_SYMBOL(drm_fb_helper_add_one_connector);



/**

 * drm_fb_helper_single_add_all_connectors() - add all connectors to fbdev

 * 					       emulation helper
@@ -162,36 +191,6 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) 
}

EXPORT_SYMBOL(drm_fb_helper_single_add_all_connectors);



int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector)

{

	struct drm_fb_helper_connector **temp;

	struct drm_fb_helper_connector *fb_helper_connector;



	if (!drm_fbdev_emulation)

		return 0;



	WARN_ON(!mutex_is_locked(&fb_helper->dev->mode_config.mutex));

	if (fb_helper->connector_count + 1 > fb_helper->connector_info_alloc_count) {

		temp = krealloc(fb_helper->connector_info, sizeof(struct drm_fb_helper_connector *) * (fb_helper->connector_count + 1), GFP_KERNEL);

		if (!temp)

			return -ENOMEM;



		fb_helper->connector_info_alloc_count = fb_helper->connector_count + 1;

		fb_helper->connector_info = temp;

	}





	fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), GFP_KERNEL);

	if (!fb_helper_connector)

		return -ENOMEM;



	drm_connector_get(connector);

	fb_helper_connector->connector = connector;

	fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;

	return 0;

}

EXPORT_SYMBOL(drm_fb_helper_add_one_connector);



int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,

				       struct drm_connector *connector)

{