Commit 62c7bdc0 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/blend: Use new atomic iterator macros.

There are new iterator macros that annotate whether the new or old
state should be used. This is better than using a state that depends on
whether it's called before or after swap. For clarity, also rename the
variables from $obj_state to (old,new)_$obj_state as well.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1487256430-7625-6-git-send-email-maarten.lankhorst@linux.intel.comReviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent b4d93679
...@@ -377,26 +377,26 @@ int drm_atomic_normalize_zpos(struct drm_device *dev, ...@@ -377,26 +377,26 @@ int drm_atomic_normalize_zpos(struct drm_device *dev,
struct drm_atomic_state *state) struct drm_atomic_state *state)
{ {
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state; struct drm_crtc_state *old_crtc_state, *new_crtc_state;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_plane_state *plane_state; struct drm_plane_state *old_plane_state, *new_plane_state;
int i, ret = 0; int i, ret = 0;
for_each_plane_in_state(state, plane, plane_state, i) { for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
crtc = plane_state->crtc; crtc = new_plane_state->crtc;
if (!crtc) if (!crtc)
continue; continue;
if (plane->state->zpos != plane_state->zpos) { if (old_plane_state->zpos != new_plane_state->zpos) {
crtc_state = drm_atomic_get_new_crtc_state(state, crtc); new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
crtc_state->zpos_changed = true; new_crtc_state->zpos_changed = true;
} }
} }
for_each_crtc_in_state(state, crtc, crtc_state, i) { for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
if (crtc_state->plane_mask != crtc->state->plane_mask || if (old_crtc_state->plane_mask != new_crtc_state->plane_mask ||
crtc_state->zpos_changed) { new_crtc_state->zpos_changed) {
ret = drm_atomic_helper_crtc_normalize_zpos(crtc, ret = drm_atomic_helper_crtc_normalize_zpos(crtc,
crtc_state); new_crtc_state);
if (ret) if (ret)
return ret; return ret;
} }
......
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