[PATCH] drm: Move vblank cleanup from unregister to release

Laurent Pinchart laurent.pinchart at ideasonboard.com
Wed Dec 14 10:48:46 UTC 2016

Calling drm_vblank_cleanup() in drm_dev_unregister() causes issues with
drivers that have moved away from the .load() and .unload() midlayer.
Those drivers call drm_dev_unregister() as the first operation at unbind
time, before shutting down the device. This results in warnings due to
drm_vblank_cleanup() being called with vblank interrupts still active,
and then to vblank events being sent after cleanup.

Fix the problem by moving vblank cleanup from drm_dev_unregister() to
drm_dev_release() that is guaranteed to be called after drivers shut
down the device.

Suggested-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
 drivers/gpu/drm/drm_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Tomi, this fixes the rmmod issue you've reported in response to
"[PATCH v4 00/22] OMAP DRM fixes and improvements".

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index a525751b4559..a899daf54ac3 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -595,6 +595,8 @@ static void drm_dev_release(struct kref *ref)
 	struct drm_device *dev = container_of(ref, struct drm_device, ref);
+	drm_vblank_cleanup(dev);
 	if (drm_core_check_feature(dev, DRIVER_GEM))
@@ -794,8 +796,6 @@ void drm_dev_unregister(struct drm_device *dev)
 	if (dev->agp)
-	drm_vblank_cleanup(dev);
 	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
 		drm_legacy_rmmap(dev, r_list->map);

Laurent Pinchart

More information about the dri-devel mailing list