6 files changed, 43 insertions, 15 deletions

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 51168a8b723a..c157103492b0 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -75,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_ */
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 2e80ad1aea84..ca71c03143d1 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -466,7 +466,7 @@ struct drm_crtc {
         int framedur_ns, linedur_ns, pixeldur_ns;
 
         /* if you are using the helper */
-        void *helper_private;
+        const void *helper_private;
 
         struct drm_object_properties properties;
 
@@ -596,7 +596,7 @@ struct drm_encoder {
         struct drm_crtc *crtc;
         struct drm_bridge *bridge;
         const struct drm_encoder_funcs *funcs;
-        void *helper_private;
+        const void *helper_private;
 };
 
 /* should we poll this connector for connects and disconnects */
@@ -700,7 +700,7 @@ struct drm_connector {
         /* requested DPMS state */
         int dpms;
 
-        void *helper_private;
+        const void *helper_private;
 
         /* forced on connector */
         struct drm_cmdline_mode cmdline_mode;
@@ -863,7 +863,7 @@ struct drm_plane {
 
         enum drm_plane_type type;
 
-        void *helper_private;
+        const void *helper_private;
 
         struct drm_plane_state *state;
 };
@@ -974,7 +974,7 @@ struct drm_mode_set {
  * struct drm_mode_config_funcs - basic driver provided mode setting functions
  * @fb_create: create a new framebuffer object
  * @output_poll_changed: function to handle output configuration changes
- * @atomic_check: check whether a give atomic state update is possible
+ * @atomic_check: check whether a given atomic state update is possible
  * @atomic_commit: commit an atomic state update previously verified with
  *      atomic_check()
  *
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 92d5135b55d2..c8fc187061de 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -197,19 +197,19 @@ extern void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
 static inline void drm_crtc_helper_add(struct drm_crtc *crtc,
                                        const struct drm_crtc_helper_funcs *funcs)
 {
-        crtc->helper_private = (void *)funcs;
+        crtc->helper_private = funcs;
 }
 
 static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
                                           const struct drm_encoder_helper_funcs *funcs)
 {
-        encoder->helper_private = (void *)funcs;
+        encoder->helper_private = funcs;
 }
 
 static inline void drm_connector_helper_add(struct drm_connector *connector,
                                             const struct drm_connector_helper_funcs *funcs)
 {
-        connector->helper_private = (void *)funcs;
+        connector->helper_private = funcs;
 }
 
 extern void drm_helper_resume_force_mode(struct drm_device *dev);
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 87d85e81d3a7..799050198323 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -215,6 +215,8 @@ struct detailed_timing {
 #define DRM_ELD_VER                     0
 # define DRM_ELD_VER_SHIFT              3
 # define DRM_ELD_VER_MASK               (0x1f << 3)
+# define DRM_ELD_VER_CEA861D            (2 << 3) /* supports 861D or below */
+# define DRM_ELD_VER_CANNED             (0x1f << 3)
 
 #define DRM_ELD_BASELINE_ELD_LEN        2       /* in dwords! */
 
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 1e6ae1458f7a..7a592d7e398b 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -149,14 +149,16 @@ drm_gem_object_unreference(struct drm_gem_object *obj)
 static inline void
 drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
 {
-        if (obj && !atomic_add_unless(&obj->refcount.refcount, -1, 1)) {
-                struct drm_device *dev = obj->dev;
+        struct drm_device *dev;
+
+        if (!obj)
+                return;
 
-                mutex_lock(&dev->struct_mutex);
-                if (likely(atomic_dec_and_test(&obj->refcount.refcount)))
-                        drm_gem_object_free(&obj->refcount);
+        dev = obj->dev;
+        if (kref_put_mutex(&obj->refcount, drm_gem_object_free, &dev->struct_mutex))
                 mutex_unlock(&dev->struct_mutex);
-        }
+        else
+                might_lock(&dev->struct_mutex);
 }
 
 int drm_gem_handle_create(struct drm_file *file_priv,
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index e48157a5a59c..96e16283afb9 100644
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -76,7 +76,7 @@ struct drm_plane_helper_funcs {
 static inline void drm_plane_helper_add(struct drm_plane *plane,
                                         const struct drm_plane_helper_funcs *funcs)
 {
-        plane->helper_private = (void *)funcs;
+        plane->helper_private = funcs;
 }
 
 extern int drm_plane_helper_check_update(struct drm_plane *plane,