Skip to content

Commit f302d33

Browse files
committed
drm/atomic-helper: Change parameter name of drm_atomic_helper_commit_planes()
drm_atomic_helper_commit_planes() updates all planes affected by a new commit. 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 a9bb617 commit f302d33

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

drivers/gpu/drm/drm_atomic_helper.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,15 +2731,15 @@ static bool plane_crtc_active(const struct drm_plane_state *state)
27312731
/**
27322732
* drm_atomic_helper_commit_planes - commit plane state
27332733
* @dev: DRM device
2734-
* @old_state: atomic state object with old state structures
2734+
* @state: atomic state object being committed
27352735
* @flags: flags for committing plane state
27362736
*
27372737
* This function commits the new plane state using the plane and atomic helper
27382738
* functions for planes and CRTCs. It assumes that the atomic state has already
27392739
* been pushed into the relevant object state pointers, since this step can no
27402740
* longer fail.
27412741
*
2742-
* It still requires the global state object @old_state to know which planes and
2742+
* It still requires the global state object @state to know which planes and
27432743
* crtcs need to be updated though.
27442744
*
27452745
* Note that this function does all plane updates across all CRTCs in one step.
@@ -2770,7 +2770,7 @@ static bool plane_crtc_active(const struct drm_plane_state *state)
27702770
* This should not be copied blindly by drivers.
27712771
*/
27722772
void drm_atomic_helper_commit_planes(struct drm_device *dev,
2773-
struct drm_atomic_state *old_state,
2773+
struct drm_atomic_state *state,
27742774
uint32_t flags)
27752775
{
27762776
struct drm_crtc *crtc;
@@ -2781,7 +2781,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
27812781
bool active_only = flags & DRM_PLANE_COMMIT_ACTIVE_ONLY;
27822782
bool no_disable = flags & DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET;
27832783

2784-
for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {
2784+
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
27852785
const struct drm_crtc_helper_funcs *funcs;
27862786

27872787
funcs = crtc->helper_private;
@@ -2792,10 +2792,10 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
27922792
if (active_only && !new_crtc_state->active)
27932793
continue;
27942794

2795-
funcs->atomic_begin(crtc, old_state);
2795+
funcs->atomic_begin(crtc, state);
27962796
}
27972797

2798-
for_each_oldnew_plane_in_state(old_state, plane, old_plane_state, new_plane_state, i) {
2798+
for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
27992799
const struct drm_plane_helper_funcs *funcs;
28002800
bool disabling;
28012801

@@ -2833,18 +2833,18 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
28332833
no_disable)
28342834
continue;
28352835

2836-
funcs->atomic_disable(plane, old_state);
2836+
funcs->atomic_disable(plane, state);
28372837
} else if (new_plane_state->crtc || disabling) {
2838-
funcs->atomic_update(plane, old_state);
2838+
funcs->atomic_update(plane, state);
28392839

28402840
if (!disabling && funcs->atomic_enable) {
28412841
if (drm_atomic_plane_enabling(old_plane_state, new_plane_state))
2842-
funcs->atomic_enable(plane, old_state);
2842+
funcs->atomic_enable(plane, state);
28432843
}
28442844
}
28452845
}
28462846

2847-
for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {
2847+
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
28482848
const struct drm_crtc_helper_funcs *funcs;
28492849

28502850
funcs = crtc->helper_private;
@@ -2855,14 +2855,14 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
28552855
if (active_only && !new_crtc_state->active)
28562856
continue;
28572857

2858-
funcs->atomic_flush(crtc, old_state);
2858+
funcs->atomic_flush(crtc, state);
28592859
}
28602860

28612861
/*
28622862
* Signal end of framebuffer access here before hw_done. After hw_done,
28632863
* a later commit might have already released the plane state.
28642864
*/
2865-
for_each_old_plane_in_state(old_state, plane, old_plane_state, i) {
2865+
for_each_old_plane_in_state(state, plane, old_plane_state, i) {
28662866
const struct drm_plane_helper_funcs *funcs = plane->helper_private;
28672867

28682868
if (funcs->end_fb_access)

0 commit comments

Comments
 (0)