@@ -2731,15 +2731,15 @@ static bool plane_crtc_active(const struct drm_plane_state *state)
2731
2731
/**
2732
2732
* drm_atomic_helper_commit_planes - commit plane state
2733
2733
* @dev: DRM device
2734
- * @old_state : atomic state object with old state structures
2734
+ * @state : atomic state object being committed
2735
2735
* @flags: flags for committing plane state
2736
2736
*
2737
2737
* This function commits the new plane state using the plane and atomic helper
2738
2738
* functions for planes and CRTCs. It assumes that the atomic state has already
2739
2739
* been pushed into the relevant object state pointers, since this step can no
2740
2740
* longer fail.
2741
2741
*
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
2743
2743
* crtcs need to be updated though.
2744
2744
*
2745
2745
* 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)
2770
2770
* This should not be copied blindly by drivers.
2771
2771
*/
2772
2772
void drm_atomic_helper_commit_planes (struct drm_device * dev ,
2773
- struct drm_atomic_state * old_state ,
2773
+ struct drm_atomic_state * state ,
2774
2774
uint32_t flags )
2775
2775
{
2776
2776
struct drm_crtc * crtc ;
@@ -2781,7 +2781,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
2781
2781
bool active_only = flags & DRM_PLANE_COMMIT_ACTIVE_ONLY ;
2782
2782
bool no_disable = flags & DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET ;
2783
2783
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 ) {
2785
2785
const struct drm_crtc_helper_funcs * funcs ;
2786
2786
2787
2787
funcs = crtc -> helper_private ;
@@ -2792,10 +2792,10 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
2792
2792
if (active_only && !new_crtc_state -> active )
2793
2793
continue ;
2794
2794
2795
- funcs -> atomic_begin (crtc , old_state );
2795
+ funcs -> atomic_begin (crtc , state );
2796
2796
}
2797
2797
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 ) {
2799
2799
const struct drm_plane_helper_funcs * funcs ;
2800
2800
bool disabling ;
2801
2801
@@ -2833,18 +2833,18 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
2833
2833
no_disable )
2834
2834
continue ;
2835
2835
2836
- funcs -> atomic_disable (plane , old_state );
2836
+ funcs -> atomic_disable (plane , state );
2837
2837
} else if (new_plane_state -> crtc || disabling ) {
2838
- funcs -> atomic_update (plane , old_state );
2838
+ funcs -> atomic_update (plane , state );
2839
2839
2840
2840
if (!disabling && funcs -> atomic_enable ) {
2841
2841
if (drm_atomic_plane_enabling (old_plane_state , new_plane_state ))
2842
- funcs -> atomic_enable (plane , old_state );
2842
+ funcs -> atomic_enable (plane , state );
2843
2843
}
2844
2844
}
2845
2845
}
2846
2846
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 ) {
2848
2848
const struct drm_crtc_helper_funcs * funcs ;
2849
2849
2850
2850
funcs = crtc -> helper_private ;
@@ -2855,14 +2855,14 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
2855
2855
if (active_only && !new_crtc_state -> active )
2856
2856
continue ;
2857
2857
2858
- funcs -> atomic_flush (crtc , old_state );
2858
+ funcs -> atomic_flush (crtc , state );
2859
2859
}
2860
2860
2861
2861
/*
2862
2862
* Signal end of framebuffer access here before hw_done. After hw_done,
2863
2863
* a later commit might have already released the plane state.
2864
2864
*/
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 ) {
2866
2866
const struct drm_plane_helper_funcs * funcs = plane -> helper_private ;
2867
2867
2868
2868
if (funcs -> end_fb_access )
0 commit comments