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

Commit 3009c037 authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter
Browse files

drm: Free atomic state during cleanup 



The current state of CRTCs, planes and connectors currently leaks during
DRM driver ->unload() unless drivers explicitly clean it up. Since there
is nothing driver-specific about it, that cleanup can be done within the
DRM core.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 37cc0148

drivers/gpu/drm/drm_crtc.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -721,6 +721,10 @@ void drm_crtc_cleanup(struct drm_crtc *crtc) 
	drm_mode_object_put(dev, &crtc->base);

	drm_mode_object_put(dev, &crtc->base);

	list_del(&crtc->head);

	list_del(&crtc->head);

	dev->mode_config.num_crtc--;

	dev->mode_config.num_crtc--;



	WARN_ON(crtc->state && !crtc->funcs->atomic_destroy_state);

	if (crtc->state && crtc->funcs->atomic_destroy_state)

		crtc->funcs->atomic_destroy_state(crtc, crtc->state);

}

}

EXPORT_SYMBOL(drm_crtc_cleanup);

EXPORT_SYMBOL(drm_crtc_cleanup);
@@ -918,6 +922,11 @@ void drm_connector_cleanup(struct drm_connector *connector) 
	connector->name = NULL;

	connector->name = NULL;

	list_del(&connector->head);

	list_del(&connector->head);

	dev->mode_config.num_connector--;

	dev->mode_config.num_connector--;



	WARN_ON(connector->state && !connector->funcs->atomic_destroy_state);

	if (connector->state && connector->funcs->atomic_destroy_state)

		connector->funcs->atomic_destroy_state(connector,

						       connector->state);

}

}

EXPORT_SYMBOL(drm_connector_cleanup);

EXPORT_SYMBOL(drm_connector_cleanup);
@@ -1244,6 +1253,10 @@ void drm_plane_cleanup(struct drm_plane *plane) 
	if (plane->type == DRM_PLANE_TYPE_OVERLAY)

	if (plane->type == DRM_PLANE_TYPE_OVERLAY)

		dev->mode_config.num_overlay_plane--;

		dev->mode_config.num_overlay_plane--;

	drm_modeset_unlock_all(dev);

	drm_modeset_unlock_all(dev);



	WARN_ON(plane->state && !plane->funcs->atomic_destroy_state);

	if (plane->state && plane->funcs->atomic_destroy_state)

		plane->funcs->atomic_destroy_state(plane, plane->state);

}

}

EXPORT_SYMBOL(drm_plane_cleanup);

EXPORT_SYMBOL(drm_plane_cleanup);