Skip to content

Commit 38129bc

Browse files
tdztomba
authored andcommitted
drm/omapdrm: Remove fb from struct omap_fbdev
Fbdev's struct fb_helper stores a pointer to the framebuffer. Remove struct omap_fbdev.fb, which contains the same value. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230403104035.15288-3-tzimmermann@suse.de
1 parent 6fe3071 commit 38129bc

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/gpu/drm/omapdrm/omap_fbdev.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module_param_named(ywrap, ywrap_enabled, bool, 0644);
2525

2626
struct omap_fbdev {
2727
struct drm_fb_helper base;
28-
struct drm_framebuffer *fb;
2928
struct drm_gem_object *bo;
3029
bool ywrap_enabled;
3130

@@ -170,7 +169,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
170169

171170
DBG("fbi=%p, dev=%p", fbi, dev);
172171

173-
fbdev->fb = fb;
174172
helper->fb = fb;
175173

176174
fbi->fbops = &omap_fb_ops;
@@ -193,7 +191,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
193191

194192

195193
DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
196-
DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
194+
DBG("allocated %dx%d fb", fb->width, fb->height);
197195

198196
return 0;
199197

@@ -266,13 +264,16 @@ void omap_fbdev_fini(struct drm_device *dev)
266264
{
267265
struct omap_drm_private *priv = dev->dev_private;
268266
struct drm_fb_helper *helper = priv->fbdev;
267+
struct drm_framebuffer *fb;
269268
struct omap_fbdev *fbdev;
270269

271270
DBG();
272271

273272
if (!helper)
274273
return;
275274

275+
fb = helper->fb;
276+
276277
drm_fb_helper_unregister_info(helper);
277278

278279
drm_fb_helper_fini(helper);
@@ -284,8 +285,8 @@ void omap_fbdev_fini(struct drm_device *dev)
284285
omap_gem_unpin(fbdev->bo);
285286

286287
/* this will free the backing object */
287-
if (fbdev->fb)
288-
drm_framebuffer_remove(fbdev->fb);
288+
if (fb)
289+
drm_framebuffer_remove(fb);
289290

290291
drm_fb_helper_unprepare(helper);
291292
kfree(fbdev);

0 commit comments

Comments
 (0)