Unverified Commit 81ed7d73 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Javier Martinez Canillas
Browse files

drm: Remove references to removed transitional helpers 



The transitional helpers were removed a long time ago, but some
references stuck.  Remove them.

Fixes: 21ebe615 ("drm: Remove transitional helpers")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ad4a2f1f9fa7da083132f6c35469c77a3f9e2f0e.1689779916.git.geert+renesas@glider.be
parent 66f9f216

drivers/gpu/drm/drm_plane_helper.c

+2 −10
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
/**

 * DOC: overview

 *

 * This helper library has two parts. The first part has support to implement

 * primary plane support on top of the normal CRTC configuration interface.

 * This helper library contains helpers to implement primary plane support on

 * top of the normal CRTC configuration interface.

 * Since the legacy &drm_mode_config_funcs.set_config interface ties the primary

 * plane together with the CRTC state this does not allow userspace to disable

 * the primary plane itself. The default primary plane only expose XRBG8888 and
@@ -51,14 +51,6 @@ 
 * planes, and newly merged drivers must not rely upon these transitional

 * helpers.

 *

 * The second part also implements transitional helpers which allow drivers to

 * gradually switch to the atomic helper infrastructure for plane updates. Once

 * that switch is complete drivers shouldn't use these any longer, instead using

 * the proper legacy implementations for update and disable plane hooks provided

 * by the atomic helpers.

 *

 * Again drivers are strongly urged to switch to the new interfaces.

 *

 * The plane helpers share the function table structures with other helpers,

 * specifically also the atomic helpers. See &struct drm_plane_helper_funcs for

 * the details.

include/drm/drm_crtc.h

+0 −5
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ struct drm_plane_helper_funcs; 
 * intended to indicate whether a full modeset is needed, rather than strictly

 * describing what has changed in a commit. See also:

 * drm_atomic_crtc_needs_modeset()

 *

 * WARNING: Transitional helpers (like drm_helper_crtc_mode_set() or

 * drm_helper_crtc_mode_set_base()) do not maintain many of the derived control

 * state like @plane_mask so drivers not converted over to atomic helpers should

 * not rely on these being accurate!

 */

struct drm_crtc_state {

	/** @crtc: backpointer to the CRTC */

include/drm/drm_modeset_helper_vtables.h

+21 −27
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ enum mode_set_atomic { 
/**

 * struct drm_crtc_helper_funcs - helper operations for CRTCs

 *

 * These hooks are used by the legacy CRTC helpers, the transitional plane

 * helpers and the new atomic modesetting helpers.

 * These hooks are used by the legacy CRTC helpers and the new atomic

 * modesetting helpers.

 */

struct drm_crtc_helper_funcs {

	/**
@@ -216,9 +216,7 @@ struct drm_crtc_helper_funcs { 
	 *

	 * This callback is used to update the display mode of a CRTC without

	 * changing anything of the primary plane configuration. This fits the

	 * requirement of atomic and hence is used by the atomic helpers. It is

	 * also used by the transitional plane helpers to implement a

	 * @mode_set hook in drm_helper_crtc_mode_set().

	 * requirement of atomic and hence is used by the atomic helpers.

	 *

	 * Note that the display pipe is completely off when this function is

	 * called. Atomic drivers which need hardware to be running before they
@@ -333,8 +331,8 @@ struct drm_crtc_helper_funcs { 
	 * all updated. Again the recommendation is to just call check helpers

	 * until a maximal configuration is reached.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional.

	 *

	 * NOTE:

	 *
@@ -373,8 +371,8 @@ struct drm_crtc_helper_funcs { 
	 * has picked. See drm_atomic_helper_commit_planes() for a discussion of

	 * the tradeoffs and variants of plane commit helpers.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional.

	 */

	void (*atomic_begin)(struct drm_crtc *crtc,

			     struct drm_atomic_state *state);
@@ -397,8 +395,8 @@ struct drm_crtc_helper_funcs { 
	 * has picked. See drm_atomic_helper_commit_planes() for a discussion of

	 * the tradeoffs and variants of plane commit helpers.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional.

	 */

	void (*atomic_flush)(struct drm_crtc *crtc,

			     struct drm_atomic_state *state);
@@ -507,8 +505,8 @@ static inline void drm_crtc_helper_add(struct drm_crtc *crtc, 
/**

 * struct drm_encoder_helper_funcs - helper operations for encoders

 *

 * These hooks are used by the legacy CRTC helpers, the transitional plane

 * helpers and the new atomic modesetting helpers.

 * These hooks are used by the legacy CRTC helpers and the new atomic

 * modesetting helpers.

 */

struct drm_encoder_helper_funcs {

	/**
@@ -1185,8 +1183,7 @@ static inline void drm_connector_helper_add(struct drm_connector *connector, 
/**

 * struct drm_plane_helper_funcs - helper operations for planes

 *

 * These functions are used by the atomic helpers and by the transitional plane

 * helpers.

 * These functions are used by the atomic helpers.

 */

struct drm_plane_helper_funcs {

	/**
@@ -1221,9 +1218,8 @@ struct drm_plane_helper_funcs { 
	 * The helpers will call @cleanup_fb with matching arguments for every

	 * successful call to this hook.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional. See @begin_fb_access

	 * for preparing per-commit resources.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional. See @begin_fb_access for preparing per-commit resources.

	 *

	 * RETURNS:

	 *
@@ -1240,8 +1236,8 @@ struct drm_plane_helper_funcs { 
	 * This hook is called to clean up any resources allocated for the given

	 * framebuffer and plane configuration in @prepare_fb.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional.

	 */

	void (*cleanup_fb)(struct drm_plane *plane,

			   struct drm_plane_state *old_state);
@@ -1295,8 +1291,8 @@ struct drm_plane_helper_funcs { 
	 * all updated. Again the recommendation is to just call check helpers

	 * until a maximal configuration is reached.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional.

	 *

	 * NOTE:

	 *
@@ -1326,8 +1322,7 @@ struct drm_plane_helper_funcs { 
	 * has picked. See drm_atomic_helper_commit_planes() for a discussion of

	 * the tradeoffs and variants of plane commit helpers.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional.

	 * This callback is used by the atomic modeset helpers, but it is optional.

	 */

	void (*atomic_update)(struct drm_plane *plane,

			      struct drm_atomic_state *state);
@@ -1376,9 +1371,8 @@ struct drm_plane_helper_funcs { 
	 * has picked. See drm_atomic_helper_commit_planes() for a discussion of

	 * the tradeoffs and variants of plane commit helpers.

	 *

	 * This callback is used by the atomic modeset helpers and by the

	 * transitional plane helpers, but it is optional. It's intended to

	 * reverse the effects of @atomic_enable.

	 * This callback is used by the atomic modeset helpers, but it is

	 * optional. It's intended to reverse the effects of @atomic_enable.

	 */

	void (*atomic_disable)(struct drm_plane *plane,

			       struct drm_atomic_state *state);