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

drm/fbdev-ttm: Remove obsolete setup function 



The old setup function drm_fbdev_ttm_setup() is unused. Remove it and
its internal callbacks. New drivers should call drm_client_setup()
instead.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240924071734.98201-73-tzimmermann@suse.de
parent e8796931

drivers/gpu/drm/drm_fbdev_ttm.c

+0 −119
Original line number Diff line number Diff line
@@ -65,15 +65,6 @@ static const struct fb_ops drm_fbdev_ttm_fb_ops = { 
	.fb_destroy	= drm_fbdev_ttm_fb_destroy,

};



/*

 * This function uses the client API to create a framebuffer backed by a dumb buffer.

 */

static int drm_fbdev_ttm_helper_fb_probe(struct drm_fb_helper *fb_helper,

					     struct drm_fb_helper_surface_size *sizes)

{

	return drm_fbdev_ttm_driver_fbdev_probe(fb_helper, sizes);

}



static void drm_fbdev_ttm_damage_blit_real(struct drm_fb_helper *fb_helper,

					   struct drm_clip_rect *clip,

					   struct iosys_map *dst)
@@ -172,7 +163,6 @@ static int drm_fbdev_ttm_helper_fb_dirty(struct drm_fb_helper *helper, 
}



static const struct drm_fb_helper_funcs drm_fbdev_ttm_helper_funcs = {

	.fb_probe = drm_fbdev_ttm_helper_fb_probe,

	.fb_dirty = drm_fbdev_ttm_helper_fb_dirty,

};
@@ -251,112 +241,3 @@ int drm_fbdev_ttm_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 
	return ret;

}

EXPORT_SYMBOL(drm_fbdev_ttm_driver_fbdev_probe);
 


static void drm_fbdev_ttm_client_unregister(struct drm_client_dev *client)

{

	struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);



	if (fb_helper->info) {

		drm_fb_helper_unregister_info(fb_helper);

	} else {

		drm_client_release(&fb_helper->client);

		drm_fb_helper_unprepare(fb_helper);

		kfree(fb_helper);

	}

}



static int drm_fbdev_ttm_client_restore(struct drm_client_dev *client)

{

	drm_fb_helper_lastclose(client->dev);



	return 0;

}



static int drm_fbdev_ttm_client_hotplug(struct drm_client_dev *client)

{

	struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);

	struct drm_device *dev = client->dev;

	int ret;



	if (dev->fb_helper)

		return drm_fb_helper_hotplug_event(dev->fb_helper);



	ret = drm_fb_helper_init(dev, fb_helper);

	if (ret)

		goto err_drm_err;



	if (!drm_drv_uses_atomic_modeset(dev))

		drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(fb_helper);

	if (ret)

		goto err_drm_fb_helper_fini;



	return 0;



err_drm_fb_helper_fini:

	drm_fb_helper_fini(fb_helper);

err_drm_err:

	drm_err(dev, "fbdev: Failed to setup emulation (ret=%d)\n", ret);

	return ret;

}



static const struct drm_client_funcs drm_fbdev_ttm_client_funcs = {

	.owner		= THIS_MODULE,

	.unregister	= drm_fbdev_ttm_client_unregister,

	.restore	= drm_fbdev_ttm_client_restore,

	.hotplug	= drm_fbdev_ttm_client_hotplug,

};



/**

 * drm_fbdev_ttm_setup() - Setup fbdev emulation for TTM-based drivers

 * @dev: DRM device

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

 *

 * This function sets up fbdev emulation for TTM-based drivers that support

 * dumb buffers with a virtual address and that can be mmap'ed.

 * drm_fbdev_ttm_setup() shall be called after the DRM driver registered

 * the new DRM device with drm_dev_register().

 *

 * Restore, hotplug events and teardown are all taken care of. Drivers that do

 * suspend/resume need to call drm_fb_helper_set_suspend_unlocked() themselves.

 * Simple drivers might use drm_mode_config_helper_suspend().

 *

 * In order to provide fixed mmap-able memory ranges, fbdev emulation

 * uses a shadow buffer in system memory. The implementation blits the shadow

 * fbdev buffer onto the real buffer in regular intervals.

 *

 * This function is safe to call even when there are no connectors present.

 * Setup will be retried on the next hotplug event.

 *

 * The fbdev is destroyed by drm_dev_unregister().

 */

void drm_fbdev_ttm_setup(struct drm_device *dev, unsigned int preferred_bpp)

{

	struct drm_fb_helper *fb_helper;

	int ret;



	drm_WARN(dev, !dev->registered, "Device has not been registered.\n");

	drm_WARN(dev, dev->fb_helper, "fb_helper is already set!\n");



	fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);

	if (!fb_helper)

		return;

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



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

	if (ret) {

		drm_err(dev, "Failed to register client: %d\n", ret);

		goto err_drm_client_init;

	}



	drm_client_register(&fb_helper->client);



	return;



err_drm_client_init:

	drm_fb_helper_unprepare(fb_helper);

	kfree(fb_helper);

	return;

}

EXPORT_SYMBOL(drm_fbdev_ttm_setup);

include/drm/drm_fbdev_ttm.h

+0 −6
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include <linux/stddef.h>



struct drm_device;

struct drm_fb_helper;

struct drm_fb_helper_surface_size;
@@ -15,14 +14,9 @@ int drm_fbdev_ttm_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 


#define DRM_FBDEV_TTM_DRIVER_OPS \

	.fbdev_probe = drm_fbdev_ttm_driver_fbdev_probe



void drm_fbdev_ttm_setup(struct drm_device *dev, unsigned int preferred_bpp);

#else

#define DRM_FBDEV_TTM_DRIVER_OPS \

	.fbdev_probe = NULL



static inline void drm_fbdev_ttm_setup(struct drm_device *dev, unsigned int preferred_bpp)

{ }

#endif



#endif