Skip to content

Commit c0a9882

Browse files
committed
drm/atomic-helper: Change parameter name of drm_atomic_helper_wait_for_dependencies()
drm_atomic_helper_wait_for_dependencies() waits for all the dependencies a commit has before going forward with it. It takes the drm_atomic_state being committed as a parameter. However, that parameter name is called (and documented) as old_state, which is pretty confusing. Let's rename that variable as state. Reviewed-by: Dmitry Baryshkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent 6d5815e commit c0a9882

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/drm_atomic_helper.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,17 +2423,17 @@ EXPORT_SYMBOL(drm_atomic_helper_setup_commit);
24232423

24242424
/**
24252425
* drm_atomic_helper_wait_for_dependencies - wait for required preceding commits
2426-
* @old_state: atomic state object with old state structures
2426+
* @state: atomic state object being committed
24272427
*
24282428
* This function waits for all preceding commits that touch the same CRTC as
2429-
* @old_state to both be committed to the hardware (as signalled by
2429+
* @state to both be committed to the hardware (as signalled by
24302430
* drm_atomic_helper_commit_hw_done()) and executed by the hardware (as signalled
24312431
* by calling drm_crtc_send_vblank_event() on the &drm_crtc_state.event).
24322432
*
24332433
* This is part of the atomic helper support for nonblocking commits, see
24342434
* drm_atomic_helper_setup_commit() for an overview.
24352435
*/
2436-
void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *old_state)
2436+
void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *state)
24372437
{
24382438
struct drm_crtc *crtc;
24392439
struct drm_crtc_state *old_crtc_state;
@@ -2444,23 +2444,23 @@ void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *old_state)
24442444
int i;
24452445
long ret;
24462446

2447-
for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {
2447+
for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) {
24482448
ret = drm_crtc_commit_wait(old_crtc_state->commit);
24492449
if (ret)
24502450
drm_err(crtc->dev,
24512451
"[CRTC:%d:%s] commit wait timed out\n",
24522452
crtc->base.id, crtc->name);
24532453
}
24542454

2455-
for_each_old_connector_in_state(old_state, conn, old_conn_state, i) {
2455+
for_each_old_connector_in_state(state, conn, old_conn_state, i) {
24562456
ret = drm_crtc_commit_wait(old_conn_state->commit);
24572457
if (ret)
24582458
drm_err(conn->dev,
24592459
"[CONNECTOR:%d:%s] commit wait timed out\n",
24602460
conn->base.id, conn->name);
24612461
}
24622462

2463-
for_each_old_plane_in_state(old_state, plane, old_plane_state, i) {
2463+
for_each_old_plane_in_state(state, plane, old_plane_state, i) {
24642464
ret = drm_crtc_commit_wait(old_plane_state->commit);
24652465
if (ret)
24662466
drm_err(plane->dev,

0 commit comments

Comments
 (0)