Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Remove references to removed transitional helpers

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

Fixes: 21ebe615c16994f3 ("drm: Remove transitional helpers")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ad4a2f1f9fa7da083132f6c35469c77a3f9e2f0e.1689779916.git.geert+renesas@glider.be

authored by

Geert Uytterhoeven and committed by
Javier Martinez Canillas
81ed7d73 66f9f216

+23 -42
+2 -10
drivers/gpu/drm/drm_plane_helper.c
··· 40 40 /** 41 41 * DOC: overview 42 42 * 43 - * This helper library has two parts. The first part has support to implement 44 - * primary plane support on top of the normal CRTC configuration interface. 43 + * This helper library contains helpers to implement primary plane support on 44 + * top of the normal CRTC configuration interface. 45 45 * Since the legacy &drm_mode_config_funcs.set_config interface ties the primary 46 46 * plane together with the CRTC state this does not allow userspace to disable 47 47 * the primary plane itself. The default primary plane only expose XRBG8888 and ··· 50 50 * Drivers are highly recommended to implement proper support for primary 51 51 * planes, and newly merged drivers must not rely upon these transitional 52 52 * helpers. 53 - * 54 - * The second part also implements transitional helpers which allow drivers to 55 - * gradually switch to the atomic helper infrastructure for plane updates. Once 56 - * that switch is complete drivers shouldn't use these any longer, instead using 57 - * the proper legacy implementations for update and disable plane hooks provided 58 - * by the atomic helpers. 59 - * 60 - * Again drivers are strongly urged to switch to the new interfaces. 61 53 * 62 54 * The plane helpers share the function table structures with other helpers, 63 55 * specifically also the atomic helpers. See &struct drm_plane_helper_funcs for
-5
include/drm/drm_crtc.h
··· 77 77 * intended to indicate whether a full modeset is needed, rather than strictly 78 78 * describing what has changed in a commit. See also: 79 79 * drm_atomic_crtc_needs_modeset() 80 - * 81 - * WARNING: Transitional helpers (like drm_helper_crtc_mode_set() or 82 - * drm_helper_crtc_mode_set_base()) do not maintain many of the derived control 83 - * state like @plane_mask so drivers not converted over to atomic helpers should 84 - * not rely on these being accurate! 85 80 */ 86 81 struct drm_crtc_state { 87 82 /** @crtc: backpointer to the CRTC */
+21 -27
include/drm/drm_modeset_helper_vtables.h
··· 59 59 /** 60 60 * struct drm_crtc_helper_funcs - helper operations for CRTCs 61 61 * 62 - * These hooks are used by the legacy CRTC helpers, the transitional plane 63 - * helpers and the new atomic modesetting helpers. 62 + * These hooks are used by the legacy CRTC helpers and the new atomic 63 + * modesetting helpers. 64 64 */ 65 65 struct drm_crtc_helper_funcs { 66 66 /** ··· 216 216 * 217 217 * This callback is used to update the display mode of a CRTC without 218 218 * changing anything of the primary plane configuration. This fits the 219 - * requirement of atomic and hence is used by the atomic helpers. It is 220 - * also used by the transitional plane helpers to implement a 221 - * @mode_set hook in drm_helper_crtc_mode_set(). 219 + * requirement of atomic and hence is used by the atomic helpers. 222 220 * 223 221 * Note that the display pipe is completely off when this function is 224 222 * called. Atomic drivers which need hardware to be running before they ··· 331 333 * all updated. Again the recommendation is to just call check helpers 332 334 * until a maximal configuration is reached. 333 335 * 334 - * This callback is used by the atomic modeset helpers and by the 335 - * transitional plane helpers, but it is optional. 336 + * This callback is used by the atomic modeset helpers, but it is 337 + * optional. 336 338 * 337 339 * NOTE: 338 340 * ··· 371 373 * has picked. See drm_atomic_helper_commit_planes() for a discussion of 372 374 * the tradeoffs and variants of plane commit helpers. 373 375 * 374 - * This callback is used by the atomic modeset helpers and by the 375 - * transitional plane helpers, but it is optional. 376 + * This callback is used by the atomic modeset helpers, but it is 377 + * optional. 376 378 */ 377 379 void (*atomic_begin)(struct drm_crtc *crtc, 378 380 struct drm_atomic_state *state); ··· 395 397 * has picked. See drm_atomic_helper_commit_planes() for a discussion of 396 398 * the tradeoffs and variants of plane commit helpers. 397 399 * 398 - * This callback is used by the atomic modeset helpers and by the 399 - * transitional plane helpers, but it is optional. 400 + * This callback is used by the atomic modeset helpers, but it is 401 + * optional. 400 402 */ 401 403 void (*atomic_flush)(struct drm_crtc *crtc, 402 404 struct drm_atomic_state *state); ··· 505 507 /** 506 508 * struct drm_encoder_helper_funcs - helper operations for encoders 507 509 * 508 - * These hooks are used by the legacy CRTC helpers, the transitional plane 509 - * helpers and the new atomic modesetting helpers. 510 + * These hooks are used by the legacy CRTC helpers and the new atomic 511 + * modesetting helpers. 510 512 */ 511 513 struct drm_encoder_helper_funcs { 512 514 /** ··· 1183 1185 /** 1184 1186 * struct drm_plane_helper_funcs - helper operations for planes 1185 1187 * 1186 - * These functions are used by the atomic helpers and by the transitional plane 1187 - * helpers. 1188 + * These functions are used by the atomic helpers. 1188 1189 */ 1189 1190 struct drm_plane_helper_funcs { 1190 1191 /** ··· 1218 1221 * The helpers will call @cleanup_fb with matching arguments for every 1219 1222 * successful call to this hook. 1220 1223 * 1221 - * This callback is used by the atomic modeset helpers and by the 1222 - * transitional plane helpers, but it is optional. See @begin_fb_access 1223 - * for preparing per-commit resources. 1224 + * This callback is used by the atomic modeset helpers, but it is 1225 + * optional. See @begin_fb_access for preparing per-commit resources. 1224 1226 * 1225 1227 * RETURNS: 1226 1228 * ··· 1236 1240 * This hook is called to clean up any resources allocated for the given 1237 1241 * framebuffer and plane configuration in @prepare_fb. 1238 1242 * 1239 - * This callback is used by the atomic modeset helpers and by the 1240 - * transitional plane helpers, but it is optional. 1243 + * This callback is used by the atomic modeset helpers, but it is 1244 + * optional. 1241 1245 */ 1242 1246 void (*cleanup_fb)(struct drm_plane *plane, 1243 1247 struct drm_plane_state *old_state); ··· 1291 1295 * all updated. Again the recommendation is to just call check helpers 1292 1296 * until a maximal configuration is reached. 1293 1297 * 1294 - * This callback is used by the atomic modeset helpers and by the 1295 - * transitional plane helpers, but it is optional. 1298 + * This callback is used by the atomic modeset helpers, but it is 1299 + * optional. 1296 1300 * 1297 1301 * NOTE: 1298 1302 * ··· 1322 1326 * has picked. See drm_atomic_helper_commit_planes() for a discussion of 1323 1327 * the tradeoffs and variants of plane commit helpers. 1324 1328 * 1325 - * This callback is used by the atomic modeset helpers and by the 1326 - * transitional plane helpers, but it is optional. 1329 + * This callback is used by the atomic modeset helpers, but it is optional. 1327 1330 */ 1328 1331 void (*atomic_update)(struct drm_plane *plane, 1329 1332 struct drm_atomic_state *state); ··· 1371 1376 * has picked. See drm_atomic_helper_commit_planes() for a discussion of 1372 1377 * the tradeoffs and variants of plane commit helpers. 1373 1378 * 1374 - * This callback is used by the atomic modeset helpers and by the 1375 - * transitional plane helpers, but it is optional. It's intended to 1376 - * reverse the effects of @atomic_enable. 1379 + * This callback is used by the atomic modeset helpers, but it is 1380 + * optional. It's intended to reverse the effects of @atomic_enable. 1377 1381 */ 1378 1382 void (*atomic_disable)(struct drm_plane *plane, 1379 1383 struct drm_atomic_state *state);