diff options
| author | Maarten Lankhorst <[email protected]> | 2017-07-12 08:13:40 +0000 |
|---|---|---|
| committer | Maarten Lankhorst <[email protected]> | 2017-07-13 07:54:48 +0000 |
| commit | 30ea752146e147c5a1f0367aa5303929f7bfd697 (patch) | |
| tree | ab011a19c65ed9fe77819ebc21ed80668f6f0b98 /drivers/gpu/drm/imx/imx-drm-core.c | |
| parent | drm/mali: Use new atomic iterator macros (diff) | |
| download | kernel-30ea752146e147c5a1f0367aa5303929f7bfd697.tar.gz kernel-30ea752146e147c5a1f0367aa5303929f7bfd697.zip | |
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 <[email protected]>
Cc: Philipp Zabel <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Daniel Vetter <[email protected]>
Reviewed-by: Philipp Zabel <[email protected]>
Tested-by: Philipp Zabel <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm-core.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 8 |
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) { 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); } |