diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-03-30 11:36:04 +0300 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2023-04-05 18:06:07 +0300 |
commit | 434434608a918f33dbb613995f2b18d3007968c1 (patch) | |
tree | b6c1ac2ef1f9a416be4d960cb936a96af9c19dd4 /drivers/gpu | |
parent | 08263e91f26025cbaa7049a322f7f9b13c56f2ee (diff) | |
download | linux-434434608a918f33dbb613995f2b18d3007968c1.tar.xz |
drm/tegra: Remove struct tegra_fbdev
Remove struct tegra_fbdev, which is an empty wrapper around struct
drm_fb_helper. Use the latter directly. No functional changes.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/tegra/drm.h | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/tegra/fb.c | 59 |
2 files changed, 22 insertions, 47 deletions
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 8f8e5cda78da..593a60b03189 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -29,12 +29,6 @@ struct reset_control; -#ifdef CONFIG_DRM_FBDEV_EMULATION -struct tegra_fbdev { - struct drm_fb_helper base; -}; -#endif - struct tegra_drm { struct drm_device *drm; @@ -52,10 +46,6 @@ struct tegra_drm { struct mutex clients_lock; struct list_head clients; -#ifdef CONFIG_DRM_FBDEV_EMULATION - struct tegra_fbdev *fbdev; -#endif - unsigned int hmask, vmask; unsigned int pitch_align; unsigned int num_crtcs; diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 44051fc44325..8e6078abcb67 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c @@ -18,13 +18,6 @@ #include "drm.h" #include "gem.h" -#ifdef CONFIG_DRM_FBDEV_EMULATION -static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper) -{ - return container_of(helper, struct tegra_fbdev, base); -} -#endif - struct tegra_bo *tegra_fb_get_plane(struct drm_framebuffer *framebuffer, unsigned int index) { @@ -297,42 +290,42 @@ static const struct drm_fb_helper_funcs tegra_fb_helper_funcs = { .fb_probe = tegra_fbdev_probe, }; -static struct tegra_fbdev *tegra_fbdev_create(struct drm_device *drm) +static struct drm_fb_helper *tegra_fbdev_create(struct drm_device *drm) { - struct tegra_fbdev *fbdev; + struct drm_fb_helper *helper; - fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); - if (!fbdev) { + helper = kzalloc(sizeof(*helper), GFP_KERNEL); + if (!helper) { dev_err(drm->dev, "failed to allocate DRM fbdev\n"); return ERR_PTR(-ENOMEM); } - drm_fb_helper_prepare(drm, &fbdev->base, 32, &tegra_fb_helper_funcs); + drm_fb_helper_prepare(drm, helper, 32, &tegra_fb_helper_funcs); - return fbdev; + return helper; } -static void tegra_fbdev_free(struct tegra_fbdev *fbdev) +static void tegra_fbdev_free(struct drm_fb_helper *helper) { - drm_fb_helper_unprepare(&fbdev->base); - kfree(fbdev); + drm_fb_helper_unprepare(helper); + kfree(helper); } -static int tegra_fbdev_init(struct tegra_fbdev *fbdev, +static int tegra_fbdev_init(struct drm_fb_helper *helper, unsigned int num_crtc, unsigned int max_connectors) { - struct drm_device *drm = fbdev->base.dev; + struct drm_device *drm = helper->dev; int err; - err = drm_fb_helper_init(drm, &fbdev->base); + err = drm_fb_helper_init(drm, helper); if (err < 0) { dev_err(drm->dev, "failed to initialize DRM FB helper: %d\n", err); return err; } - err = drm_fb_helper_initial_config(&fbdev->base); + err = drm_fb_helper_initial_config(helper); if (err < 0) { dev_err(drm->dev, "failed to set initial configuration: %d\n", err); @@ -342,13 +335,12 @@ static int tegra_fbdev_init(struct tegra_fbdev *fbdev, return 0; fini: - drm_fb_helper_fini(&fbdev->base); + drm_fb_helper_fini(helper); return err; } -static void tegra_fbdev_exit(struct tegra_fbdev *fbdev) +static void tegra_fbdev_exit(struct drm_fb_helper *helper) { - struct drm_fb_helper *helper = &fbdev->base; struct drm_framebuffer *fb = helper->fb; drm_fb_helper_unregister_info(helper); @@ -366,18 +358,16 @@ static void tegra_fbdev_exit(struct tegra_fbdev *fbdev) } drm_fb_helper_fini(helper); - tegra_fbdev_free(fbdev); + tegra_fbdev_free(helper); } #endif int tegra_drm_fb_prepare(struct drm_device *drm) { #ifdef CONFIG_DRM_FBDEV_EMULATION - struct tegra_drm *tegra = drm->dev_private; - - tegra->fbdev = tegra_fbdev_create(drm); - if (IS_ERR(tegra->fbdev)) - return PTR_ERR(tegra->fbdev); + drm->fb_helper = tegra_fbdev_create(drm); + if (IS_ERR(drm->fb_helper)) + return PTR_ERR(drm->fb_helper); #endif return 0; @@ -386,19 +376,16 @@ int tegra_drm_fb_prepare(struct drm_device *drm) void tegra_drm_fb_free(struct drm_device *drm) { #ifdef CONFIG_DRM_FBDEV_EMULATION - struct tegra_drm *tegra = drm->dev_private; - - tegra_fbdev_free(tegra->fbdev); + tegra_fbdev_free(drm->fb_helper); #endif } int tegra_drm_fb_init(struct drm_device *drm) { #ifdef CONFIG_DRM_FBDEV_EMULATION - struct tegra_drm *tegra = drm->dev_private; int err; - err = tegra_fbdev_init(tegra->fbdev, drm->mode_config.num_crtc, + err = tegra_fbdev_init(drm->fb_helper, drm->mode_config.num_crtc, drm->mode_config.num_connector); if (err < 0) return err; @@ -410,8 +397,6 @@ int tegra_drm_fb_init(struct drm_device *drm) void tegra_drm_fb_exit(struct drm_device *drm) { #ifdef CONFIG_DRM_FBDEV_EMULATION - struct tegra_drm *tegra = drm->dev_private; - - tegra_fbdev_exit(tegra->fbdev); + tegra_fbdev_exit(drm->fb_helper); #endif } |