Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

[linux-2.6-block.git] / include / drm / drm_blend.h

diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h
index 330c561c4c118cc54920c85d07133c4592872ee2..88bdfec3bd8848acd1ef5742aaaa23483b332a2e 100644 (file)
--- a/include/drm/drm_blend.h
+++ b/include/drm/drm_blend.h
@@ -27,6 +27,10 @@
 #include <linux/ctype.h>
 #include <drm/drm_mode.h>
 
+#define DRM_MODE_BLEND_PREMULTI                0
+#define DRM_MODE_BLEND_COVERAGE                1
+#define DRM_MODE_BLEND_PIXEL_NONE      2
+
 struct drm_device;
 struct drm_atomic_state;
 struct drm_plane;
@@ -52,4 +56,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane,
                                             unsigned int zpos);
 int drm_atomic_normalize_zpos(struct drm_device *dev,
                              struct drm_atomic_state *state);
+int drm_plane_create_blend_mode_property(struct drm_plane *plane,
+                                        unsigned int supported_modes);
 #endif