Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / include / drm / drm_atomic.h

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index c157103492b0d1f02b198685586202e11977bccd..8a3a913320ebb10647fea413430a3871f1f34eb1 100644 (file)
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -35,6 +35,11 @@ drm_atomic_state_alloc(struct drm_device *dev);
 void drm_atomic_state_clear(struct drm_atomic_state *state);
 void drm_atomic_state_free(struct drm_atomic_state *state);
 
+int  __must_check
+drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state);
+void drm_atomic_state_default_clear(struct drm_atomic_state *state);
+void drm_atomic_state_default_release(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);
@@ -54,6 +59,62 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
                struct drm_connector_state *state, struct drm_property *property,
                uint64_t val);
 
+/**
+ * drm_atomic_get_existing_crtc_state - get crtc state, if it exists
+ * @state: global atomic state object
+ * @crtc: crtc to grab
+ *
+ * This function returns the crtc state for the given crtc, or NULL
+ * if the crtc is not part of the global atomic state.
+ */
+static inline struct drm_crtc_state *
+drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
+                                  struct drm_crtc *crtc)
+{
+       return state->crtc_states[drm_crtc_index(crtc)];
+}
+
+/**
+ * drm_atomic_get_existing_plane_state - get plane state, if it exists
+ * @state: global atomic state object
+ * @plane: plane to grab
+ *
+ * This function returns the plane state for the given plane, or NULL
+ * if the plane is not part of the global atomic state.
+ */
+static inline struct drm_plane_state *
+drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
+                                   struct drm_plane *plane)
+{
+       return state->plane_states[drm_plane_index(plane)];
+}
+
+/**
+ * drm_atomic_get_existing_connector_state - get connector state, if it exists
+ * @state: global atomic state object
+ * @connector: connector to grab
+ *
+ * This function returns the connector state for the given connector,
+ * or NULL if the connector is not part of the global atomic state.
+ */
+static inline struct drm_connector_state *
+drm_atomic_get_existing_connector_state(struct drm_atomic_state *state,
+                                       struct drm_connector *connector)
+{
+       int index = drm_connector_index(connector);
+
+       if (index >= state->num_connector)
+               return NULL;
+
+       return state->connector_states[index];
+}
+
+int __must_check
+drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
+                            struct drm_display_mode *mode);
+int __must_check
+drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
+                                 struct drm_property_blob *blob);
 int __must_check
 drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
                              struct drm_crtc *crtc);
@@ -65,6 +126,10 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
 int __must_check
 drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
                                   struct drm_crtc *crtc);
+int __must_check
+drm_atomic_add_affected_planes(struct drm_atomic_state *state,
+                              struct drm_crtc *crtc);
+
 int
 drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
                               struct drm_crtc *crtc);
@@ -77,26 +142,32 @@ 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) < (state)->num_connector &&                          \
+            ((connector) = (state)->connectors[__i],                   \
+            (connector_state) = (state)->connector_states[__i], 1);    \
             (__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) < (state)->dev->mode_config.num_crtc &&      \
+            ((crtc) = (state)->crtcs[__i],                     \
+            (crtc_state) = (state)->crtc_states[__i], 1);      \
             (__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)++)                                           \
+#define for_each_plane_in_state(state, plane, plane_state, __i)                \
+       for ((__i) = 0;                                                 \
+            (__i) < (state)->dev->mode_config.num_total_plane &&       \
+            ((plane) = (state)->planes[__i],                           \
+            (plane_state) = (state)->plane_states[__i], 1);            \
+            (__i)++)                                                   \
                if (plane_state)
+static inline bool
+drm_atomic_crtc_needs_modeset(struct drm_crtc_state *state)
+{
+       return state->mode_changed || state->active_changed;
+}
+
 
 #endif /* DRM_ATOMIC_H_ */