m68k/defconfig: Update defconfigs for v4.7-rc2

[platform/kernel/linux-exynos.git] / include / media / vsp1.h

diff --git a/include/media/vsp1.h b/include/media/vsp1.h
index cc54175..3e654a0 100644 (file)
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
@@ -23,11 +23,22 @@ int vsp1_du_init(struct device *dev);
 int vsp1_du_setup_lif(struct device *dev, unsigned int width,
                      unsigned int height);
 
-int vsp1_du_atomic_begin(struct device *dev);
-int vsp1_du_atomic_update(struct device *dev, unsigned int rpf, u32 pixelformat,
-                         unsigned int pitch, dma_addr_t mem[2],
-                         const struct v4l2_rect *src,
-                         const struct v4l2_rect *dst);
-int vsp1_du_atomic_flush(struct device *dev);
+void vsp1_du_atomic_begin(struct device *dev);
+int vsp1_du_atomic_update_ext(struct device *dev, unsigned int rpf,
+                             u32 pixelformat, unsigned int pitch,
+                             dma_addr_t mem[2], const struct v4l2_rect *src,
+                             const struct v4l2_rect *dst, unsigned int alpha,
+                             unsigned int zpos);
+void vsp1_du_atomic_flush(struct device *dev);
+
+static inline int vsp1_du_atomic_update(struct device *dev,
+                                       unsigned int rpf_index, u32 pixelformat,
+                                       unsigned int pitch, dma_addr_t mem[2],
+                                       const struct v4l2_rect *src,
+                                       const struct v4l2_rect *dst)
+{
+       return vsp1_du_atomic_update_ext(dev, rpf_index, pixelformat, pitch,
+                                        mem, src, dst, 255, 0);
+}
 
 #endif /* __MEDIA_VSP1_H__ */