[PATCH 3/7] drm/tegra: Removed fb from struct tegra_fbdev

Thomas Zimmermann
2023-03-30T08:36:21Z

Fbdev's struct fb_helper stores a pointer to the framebuffer. Remove
struct tegra_fbdev.fb, which contains the same value. No functional
changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/tegra/drm.h | 1 -
drivers/gpu/drm/tegra/fb.c | 23 ++++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 845e60f144c7..8f8e5cda78da 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -32,7 +32,6 @@ struct reset_control;
#ifdef CONFIG_DRM_FBDEV_EMULATION
struct tegra_fbdev {
struct drm_fb_helper base;
- struct drm_framebuffer *fb;
};
#endif

diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index bfebe2786d61..1ee4771b77d3 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -217,7 +217,6 @@ static const struct fb_ops tegra_fb_ops = {
static int tegra_fbdev_probe(struct drm_fb_helper *helper,
struct drm_fb_helper_surface_size *sizes)
{
- struct tegra_fbdev *fbdev = to_tegra_fbdev(helper);
struct tegra_drm *tegra = helper->dev->dev_private;
struct drm_device *drm = helper->dev;
struct drm_mode_fb_cmd2 cmd = { 0 };
@@ -252,16 +251,15 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
return PTR_ERR(info);
}

- fbdev->fb = tegra_fb_alloc(drm, &cmd, &bo, 1);
- if (IS_ERR(fbdev->fb)) {
- err = PTR_ERR(fbdev->fb);
+ fb = tegra_fb_alloc(drm, &cmd, &bo, 1);
+ if (IS_ERR(fb)) {
+ err = PTR_ERR(fb);
dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n",
err);
drm_gem_object_put(&bo->gem);
- return PTR_ERR(fbdev->fb);
+ return PTR_ERR(fb);
}

- fb = fbdev->fb;
helper->fb = fb;
helper->info = info;

@@ -349,10 +347,13 @@ static int tegra_fbdev_init(struct tegra_fbdev *fbdev,

static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
{
- drm_fb_helper_unregister_info(&fbdev->base);
+ struct drm_fb_helper *helper = &fbdev->base;
+ struct drm_framebuffer *fb = helper->fb;

- if (fbdev->fb) {
- struct tegra_bo *bo = tegra_fb_get_plane(fbdev->fb, 0);
+ drm_fb_helper_unregister_info(helper);
+
+ if (fb) {
+ struct tegra_bo *bo = tegra_fb_get_plane(fb, 0);

/* Undo the special mapping we made in fbdev probe. */
if (bo && bo->pages) {
@@ -360,10 +361,10 @@ static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
bo->vaddr = NULL;
}

- drm_framebuffer_remove(fbdev->fb);
+ drm_framebuffer_remove(fb);
}

- drm_fb_helper_fini(&fbdev->base);
+ drm_fb_helper_fini(helper);
tegra_fbdev_free(fbdev);
}
#endif
--
2.40.0