drm: fix potential dangling else problems in for_each_ macros

[karo-tx-linux.git] / include / drm / drm_atomic.h

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index e67aeac2aee05c077eec5a47abc9d73eef6831d6..d8576ac55693da65c73cb7e66f38108e47e46242 100644 (file)
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -136,6 +136,9 @@ drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
 
 void drm_atomic_legacy_backoff(struct drm_atomic_state *state);
 
+void
+drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret);
+
 int __must_check drm_atomic_check_only(struct drm_atomic_state *state);
 int __must_check drm_atomic_commit(struct drm_atomic_state *state);
 int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
@@ -146,7 +149,7 @@ int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
             ((connector) = (state)->connectors[__i],                   \
             (connector_state) = (state)->connector_states[__i], 1);    \
             (__i)++)                                                   \
-               if (connector)
+               for_each_if (connector)
 
 #define for_each_crtc_in_state(state, crtc, crtc_state, __i)   \
        for ((__i) = 0;                                         \
@@ -154,7 +157,7 @@ int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
             ((crtc) = (state)->crtcs[__i],                     \
             (crtc_state) = (state)->crtc_states[__i], 1);      \
             (__i)++)                                           \
-               if (crtc_state)
+               for_each_if (crtc_state)
 
 #define for_each_plane_in_state(state, plane, plane_state, __i)                \
        for ((__i) = 0;                                                 \
@@ -162,7 +165,7 @@ int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
             ((plane) = (state)->planes[__i],                           \
             (plane_state) = (state)->plane_states[__i], 1);            \
             (__i)++)                                                   \
-               if (plane_state)
+               for_each_if (plane_state)
 static inline bool
 drm_atomic_crtc_needs_modeset(struct drm_crtc_state *state)
 {