Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2384d623 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/cma-helper: Stop using drm_framebuffer_unregister_private 



This is the deprecated function for when you embedded the framebuffer
somewhere else (which breaks refcounting). But cma helpers are using
drm_framebuffer_remove and a free-standing fb, so this is rendundant.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1482835765-12044-2-git-send-email-daniel.vetter@ffwll.ch
parent b77bc10b

drivers/gpu/drm/drm_fb_cma_helper.c

+3 −6
Original line number Diff line number Diff line
@@ -473,8 +473,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper, 
	return 0;



err_cma_destroy:

	drm_framebuffer_unregister_private(&fbdev_cma->fb->fb);

	drm_fb_cma_destroy(&fbdev_cma->fb->fb);

	drm_framebuffer_remove(&fbdev_cma->fb->fb);

err_fb_info_destroy:

	drm_fb_helper_release_fbi(helper);

err_gem_free_object:
@@ -574,10 +573,8 @@ void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma) 
		drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev);

	drm_fb_helper_release_fbi(&fbdev_cma->fb_helper);



	if (fbdev_cma->fb) {

		drm_framebuffer_unregister_private(&fbdev_cma->fb->fb);

		drm_fb_cma_destroy(&fbdev_cma->fb->fb);

	}

	if (fbdev_cma->fb)

		drm_framebuffer_remove(&fbdev_cma->fb->fb);



	drm_fb_helper_fini(&fbdev_cma->fb_helper);

	kfree(fbdev_cma);