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

Commit ba1f665f authored May 25, 2018 by Haneen Mohammed Committed by Daniel Vetter Jun 18, 2018

drm: Add checks for atomic_[duplicate/destroy]_state with atomic drivers

This patch add checks for atomic_[duplicate/destroy]_state of
drm_[connector/crtc/plane]_funcs for atomic drivers in the relevant
drm_*_init functions since these callback are mandatory for atomic drivers.

Update the kerneldoc comments for those callbacks.

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180525012555.GA8448@haneen-vb

parent 0baf5cc9

drivers/gpu/drm/drm_connector.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -195,6 +195,10 @@ int drm_connector_init(struct drm_device *dev,
	struct ida *connector_ida =		struct ida *connector_ida =
	&drm_connector_enum_list[connector_type].ida;		&drm_connector_enum_list[connector_type].ida;

			WARN_ON(drm_drv_uses_atomic_modeset(dev) &&
			(!funcs->atomic_destroy_state \|\|
			!funcs->atomic_duplicate_state));

	ret = __drm_mode_object_add(dev, &connector->base,		ret = __drm_mode_object_add(dev, &connector->base,
	DRM_MODE_OBJECT_CONNECTOR,		DRM_MODE_OBJECT_CONNECTOR,
	false, drm_connector_free);		false, drm_connector_free);

drivers/gpu/drm/drm_crtc.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -286,6 +286,10 @@ int drm_crtc_init_with_planes(struct drm_device dev, struct drm_crtc crtc,
	if (WARN_ON(config->num_crtc >= 32))		if (WARN_ON(config->num_crtc >= 32))
	return -EINVAL;		return -EINVAL;

			WARN_ON(drm_drv_uses_atomic_modeset(dev) &&
			(!funcs->atomic_destroy_state \|\|
			!funcs->atomic_duplicate_state));

	crtc->dev = dev;		crtc->dev = dev;
	crtc->funcs = funcs;		crtc->funcs = funcs;

drivers/gpu/drm/drm_plane.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,10 @@ int drm_universal_plane_init(struct drm_device dev, struct drm_plane plane,
	if (WARN_ON(config->num_total_plane >= 32))		if (WARN_ON(config->num_total_plane >= 32))
	return -EINVAL;		return -EINVAL;

			WARN_ON(drm_drv_uses_atomic_modeset(dev) &&
			(!funcs->atomic_destroy_state \|\|
			!funcs->atomic_duplicate_state));

	ret = drm_mode_object_add(dev, &plane->base, DRM_MODE_OBJECT_PLANE);		ret = drm_mode_object_add(dev, &plane->base, DRM_MODE_OBJECT_PLANE);
	if (ret)		if (ret)
	return ret;		return ret;

include/drm/drm_connector.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -616,6 +616,8 @@ struct drm_connector_funcs {
	* cleaned up by calling the @atomic_destroy_state hook in this		* cleaned up by calling the @atomic_destroy_state hook in this
	* structure.		* structure.
	*		*
			* This callback is mandatory for atomic drivers.
			*
	* Atomic drivers which don't subclass &struct drm_connector_state should use		* Atomic drivers which don't subclass &struct drm_connector_state should use
	* drm_atomic_helper_connector_duplicate_state(). Drivers that subclass the		* drm_atomic_helper_connector_duplicate_state(). Drivers that subclass the
	* state structure to extend it with driver-private state should use		* state structure to extend it with driver-private state should use
	@@ -642,6 +644,8 @@ struct drm_connector_funcs {
	*		*
	* Destroy a state duplicated with @atomic_duplicate_state and release		* Destroy a state duplicated with @atomic_duplicate_state and release
	* or unreference all resources it references		* or unreference all resources it references
			*
			* This callback is mandatory for atomic drivers.
	*/		*/
	void (atomic_destroy_state)(struct drm_connector connector,		void (atomic_destroy_state)(struct drm_connector connector,
	struct drm_connector_state *state);		struct drm_connector_state *state);

include/drm/drm_crtc.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -506,6 +506,8 @@ struct drm_crtc_funcs {
	* cleaned up by calling the @atomic_destroy_state hook in this		* cleaned up by calling the @atomic_destroy_state hook in this
	* structure.		* structure.
	*		*
			* This callback is mandatory for atomic drivers.
			*
	* Atomic drivers which don't subclass &struct drm_crtc_state should use		* Atomic drivers which don't subclass &struct drm_crtc_state should use
	* drm_atomic_helper_crtc_duplicate_state(). Drivers that subclass the		* drm_atomic_helper_crtc_duplicate_state(). Drivers that subclass the
	* state structure to extend it with driver-private state should use		* state structure to extend it with driver-private state should use
	@@ -532,6 +534,8 @@ struct drm_crtc_funcs {
	*		*
	* Destroy a state duplicated with @atomic_duplicate_state and release		* Destroy a state duplicated with @atomic_duplicate_state and release
	* or unreference all resources it references		* or unreference all resources it references
			*
			* This callback is mandatory for atomic drivers.
	*/		*/
	void (atomic_destroy_state)(struct drm_crtc crtc,		void (atomic_destroy_state)(struct drm_crtc crtc,
	struct drm_crtc_state *state);		struct drm_crtc_state *state);