Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/tegra: Removed fb from struct tegra_fbdev

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>
Signed-off-by: Thierry Reding <treding@nvidia.com>

authored by

Thomas Zimmermann and committed by
Thierry Reding
08263e91 dc06f4a4

+12 -12
-1
drivers/gpu/drm/tegra/drm.h
··· 32 32 #ifdef CONFIG_DRM_FBDEV_EMULATION 33 33 struct tegra_fbdev { 34 34 struct drm_fb_helper base; 35 - struct drm_framebuffer *fb; 36 35 }; 37 36 #endif 38 37
+12 -11
drivers/gpu/drm/tegra/fb.c
··· 218 218 static int tegra_fbdev_probe(struct drm_fb_helper *helper, 219 219 struct drm_fb_helper_surface_size *sizes) 220 220 { 221 - struct tegra_fbdev *fbdev = to_tegra_fbdev(helper); 222 221 struct tegra_drm *tegra = helper->dev->dev_private; 223 222 struct drm_device *drm = helper->dev; 224 223 struct drm_mode_fb_cmd2 cmd = { 0 }; ··· 252 253 return PTR_ERR(info); 253 254 } 254 255 255 - fbdev->fb = tegra_fb_alloc(drm, &cmd, &bo, 1); 256 - if (IS_ERR(fbdev->fb)) { 257 - err = PTR_ERR(fbdev->fb); 256 + fb = tegra_fb_alloc(drm, &cmd, &bo, 1); 257 + if (IS_ERR(fb)) { 258 + err = PTR_ERR(fb); 258 259 dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n", 259 260 err); 260 261 drm_gem_object_put(&bo->gem); 261 - return PTR_ERR(fbdev->fb); 262 + return PTR_ERR(fb); 262 263 } 263 264 264 - fb = fbdev->fb; 265 265 helper->fb = fb; 266 266 helper->info = info; 267 267 ··· 348 350 349 351 static void tegra_fbdev_exit(struct tegra_fbdev *fbdev) 350 352 { 351 - drm_fb_helper_unregister_info(&fbdev->base); 353 + struct drm_fb_helper *helper = &fbdev->base; 354 + struct drm_framebuffer *fb = helper->fb; 352 355 353 - if (fbdev->fb) { 354 - struct tegra_bo *bo = tegra_fb_get_plane(fbdev->fb, 0); 356 + drm_fb_helper_unregister_info(helper); 357 + 358 + if (fb) { 359 + struct tegra_bo *bo = tegra_fb_get_plane(fb, 0); 355 360 356 361 /* Undo the special mapping we made in fbdev probe. */ 357 362 if (bo && bo->pages) { ··· 362 361 bo->vaddr = NULL; 363 362 } 364 363 365 - drm_framebuffer_remove(fbdev->fb); 364 + drm_framebuffer_remove(fb); 366 365 } 367 366 368 - drm_fb_helper_fini(&fbdev->base); 367 + drm_fb_helper_fini(helper); 369 368 tegra_fbdev_free(fbdev); 370 369 } 371 370 #endif