Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / drm / drm_atomic.h

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index ad22295..c157103 100644 (file)
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -38,16 +38,25 @@ void drm_atomic_state_free(struct drm_atomic_state *state);
 struct drm_crtc_state * __must_check
 drm_atomic_get_crtc_state(struct drm_atomic_state *state,
                          struct drm_crtc *crtc);
+int drm_atomic_crtc_set_property(struct drm_crtc *crtc,
+               struct drm_crtc_state *state, struct drm_property *property,
+               uint64_t val);
 struct drm_plane_state * __must_check
 drm_atomic_get_plane_state(struct drm_atomic_state *state,
                           struct drm_plane *plane);
+int drm_atomic_plane_set_property(struct drm_plane *plane,
+               struct drm_plane_state *state, struct drm_property *property,
+               uint64_t val);
 struct drm_connector_state * __must_check
 drm_atomic_get_connector_state(struct drm_atomic_state *state,
                               struct drm_connector *connector);
+int drm_atomic_connector_set_property(struct drm_connector *connector,
+               struct drm_connector_state *state, struct drm_property *property,
+               uint64_t val);
 
 int __must_check
-drm_atomic_set_crtc_for_plane(struct drm_atomic_state *state,
-                             struct drm_plane *plane, struct drm_crtc *crtc);
+drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
+                             struct drm_crtc *crtc);
 void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,
                                 struct drm_framebuffer *fb);
 int __must_check
@@ -66,4 +75,28 @@ 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);
 
+#define for_each_connector_in_state(state, connector, connector_state, __i) \
+       for ((__i) = 0;                                                 \
+            (connector) = (state)->connectors[__i],                    \
+            (connector_state) = (state)->connector_states[__i],        \
+            (__i) < (state)->num_connector;                            \
+            (__i)++)                                                   \
+               if (connector)
+
+#define for_each_crtc_in_state(state, crtc, crtc_state, __i)   \
+       for ((__i) = 0;                                         \
+            (crtc) = (state)->crtcs[__i],                      \
+            (crtc_state) = (state)->crtc_states[__i],          \
+            (__i) < (state)->dev->mode_config.num_crtc;        \
+            (__i)++)                                           \
+               if (crtc_state)
+
+#define for_each_plane_in_state(state, plane, plane_state, __i)        \
+       for ((__i) = 0;                                         \
+            (plane) = (state)->planes[__i],                    \
+            (plane_state) = (state)->plane_states[__i],        \
+            (__i) < (state)->dev->mode_config.num_total_plane; \
+            (__i)++)                                           \
+               if (plane_state)
+
 #endif /* DRM_ATOMIC_H_ */