Commit 30ea7521 authored by Maarten Lankhorst's avatar Maarten Lankhorst

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: default avatarMaarten 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.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Tested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent a8e3fb55
...@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) ...@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
{ {
struct drm_device *dev = state->dev; struct drm_device *dev = state->dev;
struct drm_plane *plane; 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; bool plane_disabling = false;
int i; int i;
...@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) ...@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
drm_atomic_helper_commit_modeset_enables(dev, state); drm_atomic_helper_commit_modeset_enables(dev, state);
for_each_plane_in_state(state, plane, old_plane_state, i) { for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
if (drm_atomic_plane_disabling(old_plane_state, plane->state)) if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
plane_disabling = true; plane_disabling = true;
} }
if (plane_disabling) { if (plane_disabling) {
drm_atomic_helper_wait_for_vblanks(dev, state); 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); ipu_plane_disable_deferred(plane);
} }
......
...@@ -675,7 +675,7 @@ int ipu_planes_assign_pre(struct drm_device *dev, ...@@ -675,7 +675,7 @@ int ipu_planes_assign_pre(struct drm_device *dev,
int available_pres = ipu_prg_max_active_channels(); int available_pres = ipu_prg_max_active_channels();
int i; int i;
for_each_plane_in_state(state, plane, plane_state, i) { for_each_new_plane_in_state(state, plane, plane_state, i) {
struct ipu_plane_state *ipu_state = struct ipu_plane_state *ipu_state =
to_ipu_plane_state(plane_state); to_ipu_plane_state(plane_state);
struct ipu_plane *ipu_plane = to_ipu_plane(plane); struct ipu_plane *ipu_plane = to_ipu_plane(plane);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment