|
@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
|
|
|
{
|
|
|
struct drm_device *dev = state->dev;
|
|
|
struct drm_plane *plane;
|
|
|
- struct drm_plane_state *old_plane_state;
|
|
|
+ struct drm_plane_state *old_plane_state, *new_plane_state;
|
|
|
bool plane_disabling = false;
|
|
|
int i;
|
|
|
|
|
@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
|
|
|
|
|
|
drm_atomic_helper_commit_modeset_enables(dev, state);
|
|
|
|
|
|
- for_each_plane_in_state(state, plane, old_plane_state, i) {
|
|
|
- if (drm_atomic_plane_disabling(old_plane_state, plane->state))
|
|
|
+ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
|
|
|
+ if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
|
|
|
plane_disabling = true;
|
|
|
}
|
|
|
|
|
|
if (plane_disabling) {
|
|
|
drm_atomic_helper_wait_for_vblanks(dev, state);
|
|
|
|
|
|
- for_each_plane_in_state(state, plane, old_plane_state, i)
|
|
|
+ for_each_old_plane_in_state(state, plane, old_plane_state, i)
|
|
|
ipu_plane_disable_deferred(plane);
|
|
|
|
|
|
}
|