Commit ec9361a1 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/fb-helper: Remove preferred_bpp parameter from fbdev internals 



Store the console's preferred BPP value in struct drm_fb_helper
and remove the respective function parameters from the internal
fbdev code.

The BPP value is only required as a fallback and will now always
be available in the fb-helper instance.

No functional changes.

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/20230125200415.14123-6-tzimmermann@suse.de
parent f73ab51b

drivers/gpu/drm/drm_fb_helper.c

+12 −14
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static uint32_t drm_fb_helper_find_color_mode_format(struct drm_fb_helper *fb_he 
	return drm_fb_helper_find_format(fb_helper, formats, format_count, bpp, depth);

}



static int __drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int preferred_bpp,

static int __drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper,

				      struct drm_fb_helper_surface_size *sizes)

{

	struct drm_client_dev *client = &fb_helper->client;
@@ -1829,7 +1829,7 @@ static int __drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int prefe 
		surface_format = drm_fb_helper_find_color_mode_format(fb_helper,

								      plane->format_types,

								      plane->format_count,

								      preferred_bpp);

								      fb_helper->preferred_bpp);

		if (surface_format != DRM_FORMAT_INVALID)

			break; /* found supported format */

	}
@@ -1901,7 +1901,7 @@ static int __drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int prefe 
	return 0;

}



static int drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int preferred_bpp,

static int drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper,

				    struct drm_fb_helper_surface_size *sizes)

{

	struct drm_client_dev *client = &fb_helper->client;
@@ -1910,7 +1910,7 @@ static int drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int preferr 
	int ret;



	mutex_lock(&client->modeset_mutex);

	ret = __drm_fb_helper_find_sizes(fb_helper, preferred_bpp, sizes);

	ret = __drm_fb_helper_find_sizes(fb_helper, sizes);

	mutex_unlock(&client->modeset_mutex);



	if (ret)
@@ -1932,14 +1932,13 @@ static int drm_fb_helper_find_sizes(struct drm_fb_helper *fb_helper, int preferr 
 * Allocates the backing storage and sets up the fbdev info structure through

 * the ->fb_probe callback.

 */

static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,

					 int preferred_bpp)

static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper)

{

	struct drm_client_dev *client = &fb_helper->client;

	struct drm_fb_helper_surface_size sizes;

	int ret;



	ret = drm_fb_helper_find_sizes(fb_helper, preferred_bpp, &sizes);

	ret = drm_fb_helper_find_sizes(fb_helper, &sizes);

	if (ret) {

		/* First time: disable all crtc's.. */

		if (!fb_helper->deferred_setup)
@@ -2117,8 +2116,7 @@ static void drm_setup_crtcs_fb(struct drm_fb_helper *fb_helper) 


/* Note: Drops fb_helper->lock before returning. */

static int

__drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,

					  int bpp_sel)

__drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper)

{

	struct drm_device *dev = fb_helper->dev;

	struct fb_info *info;
@@ -2129,10 +2127,9 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper, 
	height = dev->mode_config.max_height;



	drm_client_modeset_probe(&fb_helper->client, width, height);

	ret = drm_fb_helper_single_fb_probe(fb_helper, bpp_sel);

	ret = drm_fb_helper_single_fb_probe(fb_helper);

	if (ret < 0) {

		if (ret == -EAGAIN) {

			fb_helper->preferred_bpp = bpp_sel;

			fb_helper->deferred_setup = true;

			ret = 0;

		}
@@ -2223,8 +2220,10 @@ int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) 
	if (!drm_fbdev_emulation)

		return 0;



	fb_helper->preferred_bpp = bpp_sel;



	mutex_lock(&fb_helper->lock);

	ret = __drm_fb_helper_initial_config_and_unlock(fb_helper, bpp_sel);

	ret = __drm_fb_helper_initial_config_and_unlock(fb_helper);



	return ret;

}
@@ -2260,8 +2259,7 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) 


	mutex_lock(&fb_helper->lock);

	if (fb_helper->deferred_setup) {

		err = __drm_fb_helper_initial_config_and_unlock(fb_helper,

				fb_helper->preferred_bpp);

		err = __drm_fb_helper_initial_config_and_unlock(fb_helper);

		return err;

	}