drm/fb-helper: Rename drm_fb_helper_unregister_fbi() to use _info postfix
Rename drm_fb_helper_unregister_fbi() to drm_fb_helper_unregister_info() as part of unifying the naming within fbdev helpers. Adapt drivers. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20221103151446.2638-15-tzimmermann@suse.de
This commit is contained in:
Родитель
7fd50bc39d
Коммит
afb0ff78c1
|
@ -155,7 +155,7 @@ void armada_fbdev_fini(struct drm_device *dev)
|
||||||
struct drm_fb_helper *fbh = priv->fbdev;
|
struct drm_fb_helper *fbh = priv->fbdev;
|
||||||
|
|
||||||
if (fbh) {
|
if (fbh) {
|
||||||
drm_fb_helper_unregister_fbi(fbh);
|
drm_fb_helper_unregister_info(fbh);
|
||||||
|
|
||||||
drm_fb_helper_fini(fbh);
|
drm_fb_helper_fini(fbh);
|
||||||
|
|
||||||
|
|
|
@ -612,19 +612,19 @@ err_release:
|
||||||
EXPORT_SYMBOL(drm_fb_helper_alloc_info);
|
EXPORT_SYMBOL(drm_fb_helper_alloc_info);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_fb_helper_unregister_fbi - unregister fb_info framebuffer device
|
* drm_fb_helper_unregister_info - unregister fb_info framebuffer device
|
||||||
* @fb_helper: driver-allocated fbdev helper, can be NULL
|
* @fb_helper: driver-allocated fbdev helper, can be NULL
|
||||||
*
|
*
|
||||||
* A wrapper around unregister_framebuffer, to release the fb_info
|
* A wrapper around unregister_framebuffer, to release the fb_info
|
||||||
* framebuffer device. This must be called before releasing all resources for
|
* framebuffer device. This must be called before releasing all resources for
|
||||||
* @fb_helper by calling drm_fb_helper_fini().
|
* @fb_helper by calling drm_fb_helper_fini().
|
||||||
*/
|
*/
|
||||||
void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
|
void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)
|
||||||
{
|
{
|
||||||
if (fb_helper && fb_helper->info)
|
if (fb_helper && fb_helper->info)
|
||||||
unregister_framebuffer(fb_helper->info);
|
unregister_framebuffer(fb_helper->info);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_fb_helper_unregister_fbi);
|
EXPORT_SYMBOL(drm_fb_helper_unregister_info);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_fb_helper_fini - finialize a &struct drm_fb_helper
|
* drm_fb_helper_fini - finialize a &struct drm_fb_helper
|
||||||
|
@ -2497,7 +2497,7 @@ static void drm_fbdev_client_unregister(struct drm_client_dev *client)
|
||||||
|
|
||||||
if (fb_helper->info)
|
if (fb_helper->info)
|
||||||
/* drm_fbdev_fb_destroy() takes care of cleanup */
|
/* drm_fbdev_fb_destroy() takes care of cleanup */
|
||||||
drm_fb_helper_unregister_fbi(fb_helper);
|
drm_fb_helper_unregister_info(fb_helper);
|
||||||
else
|
else
|
||||||
drm_fbdev_release(fb_helper);
|
drm_fbdev_release(fb_helper);
|
||||||
}
|
}
|
||||||
|
|
|
@ -201,7 +201,7 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev,
|
||||||
drm_framebuffer_remove(fb);
|
drm_framebuffer_remove(fb);
|
||||||
}
|
}
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(fb_helper);
|
drm_fb_helper_unregister_info(fb_helper);
|
||||||
|
|
||||||
drm_fb_helper_fini(fb_helper);
|
drm_fb_helper_fini(fb_helper);
|
||||||
}
|
}
|
||||||
|
|
|
@ -383,7 +383,7 @@ static int psb_fbdev_destroy(struct drm_device *dev,
|
||||||
{
|
{
|
||||||
struct drm_framebuffer *fb = fb_helper->fb;
|
struct drm_framebuffer *fb = fb_helper->fb;
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(fb_helper);
|
drm_fb_helper_unregister_info(fb_helper);
|
||||||
|
|
||||||
drm_fb_helper_fini(fb_helper);
|
drm_fb_helper_fini(fb_helper);
|
||||||
drm_framebuffer_unregister_private(fb);
|
drm_framebuffer_unregister_private(fb);
|
||||||
|
|
|
@ -584,7 +584,7 @@ void intel_fbdev_unregister(struct drm_i915_private *dev_priv)
|
||||||
if (!current_is_async())
|
if (!current_is_async())
|
||||||
intel_fbdev_sync(ifbdev);
|
intel_fbdev_sync(ifbdev);
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(&ifbdev->helper);
|
drm_fb_helper_unregister_info(&ifbdev->helper);
|
||||||
}
|
}
|
||||||
|
|
||||||
void intel_fbdev_fini(struct drm_i915_private *dev_priv)
|
void intel_fbdev_fini(struct drm_i915_private *dev_priv)
|
||||||
|
|
|
@ -182,7 +182,7 @@ void msm_fbdev_free(struct drm_device *dev)
|
||||||
|
|
||||||
DBG();
|
DBG();
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(helper);
|
drm_fb_helper_unregister_info(helper);
|
||||||
|
|
||||||
drm_fb_helper_fini(helper);
|
drm_fb_helper_fini(helper);
|
||||||
|
|
||||||
|
|
|
@ -419,7 +419,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)
|
||||||
struct drm_framebuffer *fb = fbcon->helper.fb;
|
struct drm_framebuffer *fb = fbcon->helper.fb;
|
||||||
struct nouveau_bo *nvbo;
|
struct nouveau_bo *nvbo;
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(&fbcon->helper);
|
drm_fb_helper_unregister_info(&fbcon->helper);
|
||||||
drm_fb_helper_fini(&fbcon->helper);
|
drm_fb_helper_fini(&fbcon->helper);
|
||||||
|
|
||||||
if (fb && fb->obj[0]) {
|
if (fb && fb->obj[0]) {
|
||||||
|
|
|
@ -272,7 +272,7 @@ void omap_fbdev_fini(struct drm_device *dev)
|
||||||
if (!helper)
|
if (!helper)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(helper);
|
drm_fb_helper_unregister_info(helper);
|
||||||
|
|
||||||
drm_fb_helper_fini(helper);
|
drm_fb_helper_fini(helper);
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,7 @@ static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfb
|
||||||
{
|
{
|
||||||
struct drm_framebuffer *fb = &rfbdev->fb;
|
struct drm_framebuffer *fb = &rfbdev->fb;
|
||||||
|
|
||||||
drm_fb_helper_unregister_fbi(&rfbdev->helper);
|
drm_fb_helper_unregister_info(&rfbdev->helper);
|
||||||
|
|
||||||
if (fb->obj[0]) {
|
if (fb->obj[0]) {
|
||||||
radeonfb_destroy_pinned_object(fb->obj[0]);
|
radeonfb_destroy_pinned_object(fb->obj[0]);
|
||||||
|
|
|
@ -347,7 +347,7 @@ fini:
|
||||||
|
|
||||||
static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
|
static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
|
||||||
{
|
{
|
||||||
drm_fb_helper_unregister_fbi(&fbdev->base);
|
drm_fb_helper_unregister_info(&fbdev->base);
|
||||||
|
|
||||||
if (fbdev->fb) {
|
if (fbdev->fb) {
|
||||||
struct tegra_bo *bo = tegra_fb_get_plane(fbdev->fb, 0);
|
struct tegra_bo *bo = tegra_fb_get_plane(fbdev->fb, 0);
|
||||||
|
|
|
@ -223,7 +223,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
|
||||||
int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
|
int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
|
||||||
|
|
||||||
struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper);
|
struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper);
|
||||||
void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper);
|
void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper);
|
||||||
void drm_fb_helper_fill_info(struct fb_info *info,
|
void drm_fb_helper_fill_info(struct fb_info *info,
|
||||||
struct drm_fb_helper *fb_helper,
|
struct drm_fb_helper *fb_helper,
|
||||||
struct drm_fb_helper_surface_size *sizes);
|
struct drm_fb_helper_surface_size *sizes);
|
||||||
|
@ -325,7 +325,7 @@ drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
|
static inline void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче