Commit 36206361 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: revamp framebuffer cleanup interfaces 



We have two classes of framebuffer
- Created by the driver (atm only for fbdev), and the driver holds
  onto the last reference count until destruction.
- Created by userspace and associated with a given fd. These
  framebuffers will be reaped when their assoiciated fb is closed.

Now these two cases are set up differently, the framebuffers are on
different lists and hence destruction needs to clean up different
things. Also, for userspace framebuffers we remove them from any
current usage, whereas for internal framebuffers it is assumed that
the driver has done this already.

Long story short, we need two different ways to cleanup such drivers.
Three functions are involved in total:
- drm_framebuffer_remove: Convenience function which removes the fb
  from all active usage and then drops the passed-in reference.
- drm_framebuffer_unregister_private: Will remove driver-private
  framebuffers from relevant lists and drop the corresponding
  references. Should be called for driver-private framebuffers before
  dropping the last reference (or like for a lot of the drivers where
  the fbdev is embedded someplace else, before doing the cleanup
  manually).
- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,
  should be called by the driver's ->destroy callback once the last
  reference is gone.

This patch just rolls out the new interfaces and updates all drivers
(by adding calls to drm_framebuffer_unregister_private at all the
right places)- no functional changes yet. Follow-on patches will move
drm core code around and update the lifetime management for
framebuffers, so that we are no longer required to keep framebuffers
alive by locking mode_config.mutex.

I've also updated the kerneldoc already.

vmwgfx seems to again be a bit special, at least I haven't figured out
how the fbdev support in that driver works. It smells like it's
external though.

v2: The i915 driver creates another private framebuffer in the
load-detect code. Adjust its cleanup code, too.

Reviewed-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 786b99ed

drivers/gpu/drm/ast/ast_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static void ast_fbdev_destroy(struct drm_device *dev, 
	drm_fb_helper_fini(&afbdev->helper);



	vfree(afbdev->sysram);

	drm_framebuffer_unregister_private(&afb->base);

	drm_framebuffer_cleanup(&afb->base);

}

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static int cirrus_fbdev_destroy(struct drm_device *dev, 


	vfree(gfbdev->sysram);

	drm_fb_helper_fini(&gfbdev->helper);

	drm_framebuffer_unregister_private(&gfb->base);

	drm_framebuffer_cleanup(&gfb->base);



	return 0;

drivers/gpu/drm/drm_crtc.c

+28 −3
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ void drm_modeset_unlock_all(struct drm_device *dev) 


	mutex_unlock(&dev->mode_config.mutex);

}



EXPORT_SYMBOL(drm_modeset_unlock_all);



/* Avoid boilerplate.  I'm tired of typing. */
@@ -429,12 +430,35 @@ void drm_framebuffer_reference(struct drm_framebuffer *fb) 
}

EXPORT_SYMBOL(drm_framebuffer_reference);



/**

 * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr

 * @fb: fb to unregister

 *

 * Drivers need to call this when cleaning up driver-private framebuffers, e.g.

 * those used for fbdev. Note that the caller must hold a reference of it's own,

 * i.e. the object may not be destroyed through this call (since it'll lead to a

 * locking inversion).

 */

void drm_framebuffer_unregister_private(struct drm_framebuffer *fb)

{

}

EXPORT_SYMBOL(drm_framebuffer_unregister_private);



/**

 * drm_framebuffer_cleanup - remove a framebuffer object

 * @fb: framebuffer to remove

 *

 * Scans all the CRTCs in @dev's mode_config.  If they're using @fb, removes

 * it, setting it to NULL.

 * Cleanup references to a user-created framebuffer. This function is intended

 * to be used from the drivers ->destroy callback.

 *

 * Note that this function does not remove the fb from active usuage - if it is

 * still used anywhere, hilarity can ensue since userspace could call getfb on

 * the id and get back -EINVAL. Obviously no concern at driver unload time.

 *

 * Also, the framebuffer will not be removed from the lookup idr - for

 * user-created framebuffers this will happen in in the rmfb ioctl. For

 * driver-private objects (e.g. for fbdev) drivers need to explicitly call

 * drm_framebuffer_unregister_private.

 */

void drm_framebuffer_cleanup(struct drm_framebuffer *fb)

{
@@ -460,7 +484,8 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup); 
 * @fb: framebuffer to remove

 *

 * Scans all the CRTCs and planes in @dev's mode_config.  If they're

 * using @fb, removes it, setting it to NULL.

 * using @fb, removes it, setting it to NULL. Then drops the reference to the

 * passed-in framebuffer.

 */

void drm_framebuffer_remove(struct drm_framebuffer *fb)

{

drivers/gpu/drm/drm_fb_cma_helper.c

+4 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, 
	return 0;



err_drm_fb_cma_destroy:

	drm_framebuffer_unregister_private(fb);

	drm_fb_cma_destroy(fb);

err_framebuffer_release:

	framebuffer_release(fbi);
@@ -370,8 +371,10 @@ void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma) 
		framebuffer_release(info);

	}



	if (fbdev_cma->fb)

	if (fbdev_cma->fb) {

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

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

	}



	drm_fb_helper_fini(&fbdev_cma->fb_helper);

	kfree(fbdev_cma);

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+3 −1
Original line number Diff line number Diff line
@@ -326,9 +326,11 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev, 
	/* release drm framebuffer and real buffer */

	if (fb_helper->fb && fb_helper->fb->funcs) {

		fb = fb_helper->fb;

		if (fb)

		if (fb) {

			drm_framebuffer_unregister_private(fb);

			drm_framebuffer_remove(fb);

		}

	}



	/* release linux framebuffer */

	if (fb_helper->fbdev) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE