Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux-2.6-block.git] / include / media / vsp1.h

diff --git a/include/media/vsp1.h b/include/media/vsp1.h
index 3e654a0455bd95bc0373e82547fd640385937f4b..9322d9775fb7e1a0dc4958bc56d6801397d8cab4 100644 (file)
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
@@ -14,31 +14,28 @@
 #define __MEDIA_VSP1_H__
 
 #include <linux/types.h>
+#include <linux/videodev2.h>
 
 struct device;
-struct v4l2_rect;
 
 int vsp1_du_init(struct device *dev);
 
 int vsp1_du_setup_lif(struct device *dev, unsigned int width,
                      unsigned int height);
 
+struct vsp1_du_atomic_config {
+       u32 pixelformat;
+       unsigned int pitch;
+       dma_addr_t mem[2];
+       struct v4l2_rect src;
+       struct v4l2_rect dst;
+       unsigned int alpha;
+       unsigned int zpos;
+};
+
 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);
+int vsp1_du_atomic_update(struct device *dev, unsigned int rpf,
+                         const struct vsp1_du_atomic_config *cfg);
 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__ */