aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/imx-drm-core.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-07-12 04:13:40 -0400
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-07-13 03:54:48 -0400
commit30ea752146e147c5a1f0367aa5303929f7bfd697 (patch)
treeab011a19c65ed9fe77819ebc21ed80668f6f0b98 /drivers/gpu/drm/imx/imx-drm-core.c
parenta8e3fb5508fe559c2318c2b6966867110e4de98c (diff)
drm/imx: Use atomic iterator macros
for_each_obj_in_state is about to be removed, so use the new atomic iterator macros. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Link: http://patchwork.freedesktop.org/patch/msgid/20170712081344.25495-13-maarten.lankhorst@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm-core.c')
-rw-r--r--drivers/gpu/drm/imx/imx-drm-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 95e2181963d9..f5c621219113 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
115{ 115{
116 struct drm_device *dev = state->dev; 116 struct drm_device *dev = state->dev;
117 struct drm_plane *plane; 117 struct drm_plane *plane;
118 struct drm_plane_state *old_plane_state; 118 struct drm_plane_state *old_plane_state, *new_plane_state;
119 bool plane_disabling = false; 119 bool plane_disabling = false;
120 int i; 120 int i;
121 121
@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
127 127
128 drm_atomic_helper_commit_modeset_enables(dev, state); 128 drm_atomic_helper_commit_modeset_enables(dev, state);
129 129
130 for_each_plane_in_state(state, plane, old_plane_state, i) { 130 for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
131 if (drm_atomic_plane_disabling(old_plane_state, plane->state)) 131 if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
132 plane_disabling = true; 132 plane_disabling = true;
133 } 133 }
134 134
135 if (plane_disabling) { 135 if (plane_disabling) {
136 drm_atomic_helper_wait_for_vblanks(dev, state); 136 drm_atomic_helper_wait_for_vblanks(dev, state);
137 137
138 for_each_plane_in_state(state, plane, old_plane_state, i) 138 for_each_old_plane_in_state(state, plane, old_plane_state, i)
139 ipu_plane_disable_deferred(plane); 139 ipu_plane_disable_deferred(plane);
140 140
141 } 141 }