Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_crtc_internal.h

diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index a2945ee6d6755bc101bdd3ef184ea891b7bbeea8..247dc8b625645b308631201486df4bfd1556eef8 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -36,3 +36,9 @@ int drm_mode_object_get(struct drm_device *dev,
 void drm_mode_object_put(struct drm_device *dev,
                         struct drm_mode_object *object);
 
+/* drm_atomic.c */
+int drm_atomic_get_property(struct drm_mode_object *obj,
+                          struct drm_property *property, uint64_t *val);
+int drm_mode_atomic_ioctl(struct drm_device *dev,
+                         void *data, struct drm_file *file_priv);
+