Commit 6c80a93b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/fb-helper: Initialize fb-helper's preferred BPP in prepare function 



Initialize the fb-helper's preferred_bpp field early from within
drm_fb_helper_prepare(); instead of the later client hot-plugging
callback. This simplifies the generic fbdev setup function.

No real changes, but all drivers' fbdev code has to be adapted.

v3:
	* build with CONFIG_DRM_FBDEV_EMULATION unset (kernel test bot)

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-7-tzimmermann@suse.de
parent ec9361a1

drivers/gpu/drm/armada/armada_fbdev.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int armada_fbdev_init(struct drm_device *dev) 


	priv->fbdev = fbh;



	drm_fb_helper_prepare(dev, fbh, &armada_fb_helper_funcs);

	drm_fb_helper_prepare(dev, fbh, 32, &armada_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, fbh);

	if (ret) {
@@ -137,7 +137,7 @@ int armada_fbdev_init(struct drm_device *dev) 
		goto err_fb_helper;

	}



	ret = drm_fb_helper_initial_config(fbh, 32);

	ret = drm_fb_helper_initial_config(fbh);

	if (ret) {

		DRM_ERROR("failed to set initial config\n");

		goto err_fb_setup;

drivers/gpu/drm/drm_fb_helper.c

+18 −4
Original line number Diff line number Diff line
@@ -414,14 +414,30 @@ static void drm_fb_helper_damage_work(struct work_struct *work) 
 * drm_fb_helper_prepare - setup a drm_fb_helper structure

 * @dev: DRM device

 * @helper: driver-allocated fbdev helper structure to set up

 * @preferred_bpp: Preferred bits per pixel for the device.

 * @funcs: pointer to structure of functions associate with this helper

 *

 * Sets up the bare minimum to make the framebuffer helper usable. This is

 * useful to implement race-free initialization of the polling helpers.

 */

void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,

			   unsigned int preferred_bpp,

			   const struct drm_fb_helper_funcs *funcs)

{

	/*

	 * Pick a preferred bpp of 32 if no value has been given. This

	 * will select XRGB8888 for the framebuffer formats. All drivers

	 * have to support XRGB8888 for backwards compatibility with legacy

	 * userspace, so it's the safe choice here.

	 *

	 * TODO: Replace struct drm_mode_config.preferred_depth and this

	 *       bpp value with a preferred format that is given as struct

	 *       drm_format_info. Then derive all other values from the

	 *       format.

	 */

	if (!preferred_bpp)

		preferred_bpp = 32;



	INIT_LIST_HEAD(&helper->kernel_fb_list);

	spin_lock_init(&helper->damage_lock);

	INIT_WORK(&helper->resume_work, drm_fb_helper_resume_worker);
@@ -430,6 +446,7 @@ void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, 
	mutex_init(&helper->lock);

	helper->funcs = funcs;

	helper->dev = dev;

	helper->preferred_bpp = preferred_bpp;

}

EXPORT_SYMBOL(drm_fb_helper_prepare);
@@ -2175,7 +2192,6 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper) 
/**

 * drm_fb_helper_initial_config - setup a sane initial connector configuration

 * @fb_helper: fb_helper device struct

 * @bpp_sel: bpp value to use for the framebuffer configuration

 *

 * Scans the CRTCs and connectors and tries to put together an initial setup.

 * At the moment, this is a cloned configuration across all heads with
@@ -2213,15 +2229,13 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper) 
 * RETURNS:

 * Zero if everything went ok, nonzero otherwise.

 */

int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel)

int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper)

{

	int ret;



	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);

drivers/gpu/drm/drm_fbdev_generic.c

+2 −17
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client) 
	if (!drm_drv_uses_atomic_modeset(dev))

		drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(fb_helper, fb_helper->preferred_bpp);

	ret = drm_fb_helper_initial_config(fb_helper);

	if (ret)

		goto err_cleanup;
@@ -454,7 +454,7 @@ void drm_fbdev_generic_setup(struct drm_device *dev, 
	fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);

	if (!fb_helper)

		return;

	drm_fb_helper_prepare(dev, fb_helper, &drm_fb_helper_generic_funcs);

	drm_fb_helper_prepare(dev, fb_helper, preferred_bpp, &drm_fb_helper_generic_funcs);



	ret = drm_client_init(dev, &fb_helper->client, "fbdev", &drm_fbdev_client_funcs);

	if (ret) {
@@ -462,21 +462,6 @@ void drm_fbdev_generic_setup(struct drm_device *dev, 
		goto err_drm_client_init;

	}



	/*

	 * Pick a preferred bpp of 32 if no value has been given. This

	 * will select XRGB8888 for the framebuffer formats. All drivers

	 * have to support XRGB8888 for backwards compatibility with legacy

	 * userspace, so it's the safe choice here.

	 *

	 * TODO: Replace struct drm_mode_config.preferred_depth and this

	 *       bpp value with a preferred format that is given as struct

	 *       drm_format_info. Then derive all other values from the

	 *       format.

	 */

	if (!preferred_bpp)

		preferred_bpp = 32;

	fb_helper->preferred_bpp = preferred_bpp;



	ret = drm_fbdev_client_hotplug(&fb_helper->client);

	if (ret)

		drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int exynos_drm_fbdev_init(struct drm_device *dev) 


	private->fb_helper = helper = &fbdev->drm_fb_helper;



	drm_fb_helper_prepare(dev, helper, &exynos_drm_fb_helper_funcs);

	drm_fb_helper_prepare(dev, helper, PREFERRED_BPP, &exynos_drm_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, helper);

	if (ret < 0) {
@@ -172,7 +172,7 @@ int exynos_drm_fbdev_init(struct drm_device *dev) 
		goto err_init;

	}



	ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);

	ret = drm_fb_helper_initial_config(helper);

	if (ret < 0) {

		DRM_DEV_ERROR(dev->dev,

			      "failed to set up hw configuration.\n");

drivers/gpu/drm/gma500/framebuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ int psb_fbdev_init(struct drm_device *dev) 


	dev_priv->fb_helper = fb_helper;



	drm_fb_helper_prepare(dev, fb_helper, &psb_fb_helper_funcs);

	drm_fb_helper_prepare(dev, fb_helper, 32, &psb_fb_helper_funcs);



	ret = drm_fb_helper_init(dev, fb_helper);

	if (ret)
@@ -418,7 +418,7 @@ int psb_fbdev_init(struct drm_device *dev) 
	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(fb_helper, 32);

	ret = drm_fb_helper_initial_config(fb_helper);

	if (ret)

		goto fini;