Merge tag 'ipu-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next

IPUv3 preparations for capture support

* tag 'ipu-3.18' of git://git.pengutronix.de/git/pza/linux: (26 commits)
  gpu: ipu-v3: Add ipu_dump()
  gpu: ipu-cpmem: Add ipu_cpmem_dump()
  gpu: ipu-v3: Add more planar formats support
  gpu: ipu-cpmem: Add second buffer support to ipu_cpmem_set_image()
  gpu: ipu-cpmem: Add ipu_cpmem_set_rotation()
  gpu: ipu-cpmem: Add ipu_cpmem_set_axi_id()
  gpu: ipu-cpmem: Add ipu_cpmem_set_block_mode()
  gpu: ipu-v3: Add ipu_idmac_lock_enable()
  gpu: ipu-v3: Add ipu_idmac_enable_watermark()
  gpu: ipu-v3: Add ipu_stride_to_bytes()
  gpu: ipu-v3: Add __ipu_idmac_reset_current_buffer()
  gpu: ipu-v3: Add ipu_idmac_clear_buffer()
  gpu: ipu-v3: Add ipu_idmac_buffer_is_ready()
  gpu: ipu-v3: Move IDMAC channel names to imx-ipu-v3.h
  gpu: ipu-v3: Add helper function checking if pixfmt is planar
  gpu: ipu-v3: Add rotation mode conversion utilities
  gpu: ipu-v3: Add ipu_mbus_code_to_colorspace()
  gpu: ipu-v3: smfc: Add ipu_smfc_set_watermark()
  gpu: ipu-v3: smfc: Convert to per-channel
  gpu: ipu-v3: smfc: Move enable/disable to ipu-smfc.c
  ...

1 files changed, 170 insertions, 156 deletions

diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index 3e43e22cdff9..c74bf4a0520e 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -16,6 +16,7 @@
 #include <linux/videodev2.h>
 #include <linux/bitmap.h>
 #include <linux/fb.h>
+#include <media/v4l2-mediabus.h>
 
 struct ipu_soc;
 
@@ -61,6 +62,29 @@ struct ipu_di_signal_cfg {
         u8 vsync_pin;
 };
 
+/*
+ * Enumeration of CSI destinations
+ */
+enum ipu_csi_dest {
+        IPU_CSI_DEST_IDMAC, /* to memory via SMFC */
+        IPU_CSI_DEST_IC,        /* to Image Converter */
+        IPU_CSI_DEST_VDIC,  /* to VDIC */
+};
+
+/*
+ * Enumeration of IPU rotation modes
+ */
+enum ipu_rotate_mode {
+        IPU_ROTATE_NONE = 0,
+        IPU_ROTATE_VERT_FLIP,
+        IPU_ROTATE_HORIZ_FLIP,
+        IPU_ROTATE_180,
+        IPU_ROTATE_90_RIGHT,
+        IPU_ROTATE_90_RIGHT_VFLIP,
+        IPU_ROTATE_90_RIGHT_HFLIP,
+        IPU_ROTATE_90_LEFT,
+};
+
 enum ipu_color_space {
         IPUV3_COLORSPACE_RGB,
         IPUV3_COLORSPACE_YUV,
@@ -76,6 +100,36 @@ enum ipu_channel_irq {
         IPU_IRQ_EOS = 192,
 };
 
+/*
+ * Enumeration of IDMAC channels
+ */
+#define IPUV3_CHANNEL_CSI0                       0
+#define IPUV3_CHANNEL_CSI1                       1
+#define IPUV3_CHANNEL_CSI2                       2
+#define IPUV3_CHANNEL_CSI3                       3
+#define IPUV3_CHANNEL_VDI_MEM_IC_VF              5
+#define IPUV3_CHANNEL_MEM_IC_PP                 11
+#define IPUV3_CHANNEL_MEM_IC_PRP_VF             12
+#define IPUV3_CHANNEL_G_MEM_IC_PRP_VF           14
+#define IPUV3_CHANNEL_G_MEM_IC_PP               15
+#define IPUV3_CHANNEL_IC_PRP_ENC_MEM            20
+#define IPUV3_CHANNEL_IC_PRP_VF_MEM             21
+#define IPUV3_CHANNEL_IC_PP_MEM                 22
+#define IPUV3_CHANNEL_MEM_BG_SYNC               23
+#define IPUV3_CHANNEL_MEM_BG_ASYNC              24
+#define IPUV3_CHANNEL_MEM_FG_SYNC               27
+#define IPUV3_CHANNEL_MEM_DC_SYNC               28
+#define IPUV3_CHANNEL_MEM_FG_ASYNC              29
+#define IPUV3_CHANNEL_MEM_FG_SYNC_ALPHA         31
+#define IPUV3_CHANNEL_MEM_DC_ASYNC              41
+#define IPUV3_CHANNEL_MEM_ROT_ENC               45
+#define IPUV3_CHANNEL_MEM_ROT_VF                46
+#define IPUV3_CHANNEL_MEM_ROT_PP                47
+#define IPUV3_CHANNEL_ROT_ENC_MEM               48
+#define IPUV3_CHANNEL_ROT_VF_MEM                49
+#define IPUV3_CHANNEL_ROT_PP_MEM                50
+#define IPUV3_CHANNEL_MEM_BG_SYNC_ALPHA         51
+
 int ipu_map_irq(struct ipu_soc *ipu, int irq);
 int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
                 enum ipu_channel_irq irq);
@@ -93,6 +147,13 @@ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
 #define IPU_IRQ_VSYNC_PRE_1             (448 + 15)
 
 /*
+ * IPU Common functions
+ */
+void ipu_set_csi_src_mux(struct ipu_soc *ipu, int csi_id, bool mipi_csi2);
+void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi);
+void ipu_dump(struct ipu_soc *ipu);
+
+/*
  * IPU Image DMA Controller (idmac) functions
  */
 struct ipuv3_channel *ipu_idmac_get(struct ipu_soc *ipu, unsigned channel);
@@ -100,12 +161,58 @@ void ipu_idmac_put(struct ipuv3_channel *);
 
 int ipu_idmac_enable_channel(struct ipuv3_channel *channel);
 int ipu_idmac_disable_channel(struct ipuv3_channel *channel);
+void ipu_idmac_enable_watermark(struct ipuv3_channel *channel, bool enable);
+int ipu_idmac_lock_enable(struct ipuv3_channel *channel, int num_bursts);
 int ipu_idmac_wait_busy(struct ipuv3_channel *channel, int ms);
 
 void ipu_idmac_set_double_buffer(struct ipuv3_channel *channel,
                 bool doublebuffer);
 int ipu_idmac_get_current_buffer(struct ipuv3_channel *channel);
+bool ipu_idmac_buffer_is_ready(struct ipuv3_channel *channel, u32 buf_num);
 void ipu_idmac_select_buffer(struct ipuv3_channel *channel, u32 buf_num);
+void ipu_idmac_clear_buffer(struct ipuv3_channel *channel, u32 buf_num);
+
+/*
+ * IPU Channel Parameter Memory (cpmem) functions
+ */
+struct ipu_rgb {
+        struct fb_bitfield      red;
+        struct fb_bitfield      green;
+        struct fb_bitfield      blue;
+        struct fb_bitfield      transp;
+        int                     bits_per_pixel;
+};
+
+struct ipu_image {
+        struct v4l2_pix_format pix;
+        struct v4l2_rect rect;
+        dma_addr_t phys0;
+        dma_addr_t phys1;
+};
+
+void ipu_cpmem_zero(struct ipuv3_channel *ch);
+void ipu_cpmem_set_resolution(struct ipuv3_channel *ch, int xres, int yres);
+void ipu_cpmem_set_stride(struct ipuv3_channel *ch, int stride);
+void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch);
+void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf);
+void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride);
+void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id);
+void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize);
+void ipu_cpmem_set_block_mode(struct ipuv3_channel *ch);
+void ipu_cpmem_set_rotation(struct ipuv3_channel *ch,
+                            enum ipu_rotate_mode rot);
+int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch,
+                             const struct ipu_rgb *rgb);
+int ipu_cpmem_set_format_passthrough(struct ipuv3_channel *ch, int width);
+void ipu_cpmem_set_yuv_interleaved(struct ipuv3_channel *ch, u32 pixel_format);
+void ipu_cpmem_set_yuv_planar_full(struct ipuv3_channel *ch,
+                                   u32 pixel_format, int stride,
+                                   int u_offset, int v_offset);
+void ipu_cpmem_set_yuv_planar(struct ipuv3_channel *ch,
+                              u32 pixel_format, int stride, int height);
+int ipu_cpmem_set_fmt(struct ipuv3_channel *ch, u32 drm_fourcc);
+int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image);
+void ipu_cpmem_dump(struct ipuv3_channel *ch);
 
 /*
  * IPU Display Controller (dc) functions
@@ -169,171 +276,78 @@ int ipu_dp_set_global_alpha(struct ipu_dp *dp, bool enable, u8 alpha,
 /*
  * IPU CMOS Sensor Interface (csi) functions
  */
-int ipu_csi_enable(struct ipu_soc *ipu, int csi);
-int ipu_csi_disable(struct ipu_soc *ipu, int csi);
+struct ipu_csi;
+int ipu_csi_init_interface(struct ipu_csi *csi,
+                           struct v4l2_mbus_config *mbus_cfg,
+                           struct v4l2_mbus_framefmt *mbus_fmt);
+bool ipu_csi_is_interlaced(struct ipu_csi *csi);
+void ipu_csi_get_window(struct ipu_csi *csi, struct v4l2_rect *w);
+void ipu_csi_set_window(struct ipu_csi *csi, struct v4l2_rect *w);
+void ipu_csi_set_test_generator(struct ipu_csi *csi, bool active,
+                                u32 r_value, u32 g_value, u32 b_value,
+                                u32 pix_clk);
+int ipu_csi_set_mipi_datatype(struct ipu_csi *csi, u32 vc,
+                              struct v4l2_mbus_framefmt *mbus_fmt);
+int ipu_csi_set_skip_smfc(struct ipu_csi *csi, u32 skip,
+                          u32 max_ratio, u32 id);
+int ipu_csi_set_dest(struct ipu_csi *csi, enum ipu_csi_dest csi_dest);
+int ipu_csi_enable(struct ipu_csi *csi);
+int ipu_csi_disable(struct ipu_csi *csi);
+struct ipu_csi *ipu_csi_get(struct ipu_soc *ipu, int id);
+void ipu_csi_put(struct ipu_csi *csi);
+void ipu_csi_dump(struct ipu_csi *csi);
 
 /*
- * IPU Sensor Multiple FIFO Controller (SMFC) functions
+ * IPU Image Converter (ic) functions
  */
-int ipu_smfc_enable(struct ipu_soc *ipu);
-int ipu_smfc_disable(struct ipu_soc *ipu);
-int ipu_smfc_map_channel(struct ipu_soc *ipu, int channel, int csi_id, int mipi_id);
-int ipu_smfc_set_burstsize(struct ipu_soc *ipu, int channel, int burstsize);
-
-#define IPU_CPMEM_WORD(word, ofs, size) ((((word) * 160 + (ofs)) << 8) | (size))
-
-#define IPU_FIELD_UBO           IPU_CPMEM_WORD(0, 46, 22)
-#define IPU_FIELD_VBO           IPU_CPMEM_WORD(0, 68, 22)
-#define IPU_FIELD_IOX           IPU_CPMEM_WORD(0, 90, 4)
-#define IPU_FIELD_RDRW          IPU_CPMEM_WORD(0, 94, 1)
-#define IPU_FIELD_SO            IPU_CPMEM_WORD(0, 113, 1)
-#define IPU_FIELD_SLY           IPU_CPMEM_WORD(1, 102, 14)
-#define IPU_FIELD_SLUV          IPU_CPMEM_WORD(1, 128, 14)
-
-#define IPU_FIELD_XV            IPU_CPMEM_WORD(0, 0, 10)
-#define IPU_FIELD_YV            IPU_CPMEM_WORD(0, 10, 9)
-#define IPU_FIELD_XB            IPU_CPMEM_WORD(0, 19, 13)
-#define IPU_FIELD_YB            IPU_CPMEM_WORD(0, 32, 12)
-#define IPU_FIELD_NSB_B         IPU_CPMEM_WORD(0, 44, 1)
-#define IPU_FIELD_CF            IPU_CPMEM_WORD(0, 45, 1)
-#define IPU_FIELD_SX            IPU_CPMEM_WORD(0, 46, 12)
-#define IPU_FIELD_SY            IPU_CPMEM_WORD(0, 58, 11)
-#define IPU_FIELD_NS            IPU_CPMEM_WORD(0, 69, 10)
-#define IPU_FIELD_SDX           IPU_CPMEM_WORD(0, 79, 7)
-#define IPU_FIELD_SM            IPU_CPMEM_WORD(0, 86, 10)
-#define IPU_FIELD_SCC           IPU_CPMEM_WORD(0, 96, 1)
-#define IPU_FIELD_SCE           IPU_CPMEM_WORD(0, 97, 1)
-#define IPU_FIELD_SDY           IPU_CPMEM_WORD(0, 98, 7)
-#define IPU_FIELD_SDRX          IPU_CPMEM_WORD(0, 105, 1)
-#define IPU_FIELD_SDRY          IPU_CPMEM_WORD(0, 106, 1)
-#define IPU_FIELD_BPP           IPU_CPMEM_WORD(0, 107, 3)
-#define IPU_FIELD_DEC_SEL       IPU_CPMEM_WORD(0, 110, 2)
-#define IPU_FIELD_DIM           IPU_CPMEM_WORD(0, 112, 1)
-#define IPU_FIELD_BNDM          IPU_CPMEM_WORD(0, 114, 3)
-#define IPU_FIELD_BM            IPU_CPMEM_WORD(0, 117, 2)
-#define IPU_FIELD_ROT           IPU_CPMEM_WORD(0, 119, 1)
-#define IPU_FIELD_HF            IPU_CPMEM_WORD(0, 120, 1)
-#define IPU_FIELD_VF            IPU_CPMEM_WORD(0, 121, 1)
-#define IPU_FIELD_THE           IPU_CPMEM_WORD(0, 122, 1)
-#define IPU_FIELD_CAP           IPU_CPMEM_WORD(0, 123, 1)
-#define IPU_FIELD_CAE           IPU_CPMEM_WORD(0, 124, 1)
-#define IPU_FIELD_FW            IPU_CPMEM_WORD(0, 125, 13)
-#define IPU_FIELD_FH            IPU_CPMEM_WORD(0, 138, 12)
-#define IPU_FIELD_EBA0          IPU_CPMEM_WORD(1, 0, 29)
-#define IPU_FIELD_EBA1          IPU_CPMEM_WORD(1, 29, 29)
-#define IPU_FIELD_ILO           IPU_CPMEM_WORD(1, 58, 20)
-#define IPU_FIELD_NPB           IPU_CPMEM_WORD(1, 78, 7)
-#define IPU_FIELD_PFS           IPU_CPMEM_WORD(1, 85, 4)
-#define IPU_FIELD_ALU           IPU_CPMEM_WORD(1, 89, 1)
-#define IPU_FIELD_ALBM          IPU_CPMEM_WORD(1, 90, 3)
-#define IPU_FIELD_ID            IPU_CPMEM_WORD(1, 93, 2)
-#define IPU_FIELD_TH            IPU_CPMEM_WORD(1, 95, 7)
-#define IPU_FIELD_SL            IPU_CPMEM_WORD(1, 102, 14)
-#define IPU_FIELD_WID0          IPU_CPMEM_WORD(1, 116, 3)
-#define IPU_FIELD_WID1          IPU_CPMEM_WORD(1, 119, 3)
-#define IPU_FIELD_WID2          IPU_CPMEM_WORD(1, 122, 3)
-#define IPU_FIELD_WID3          IPU_CPMEM_WORD(1, 125, 3)
-#define IPU_FIELD_OFS0          IPU_CPMEM_WORD(1, 128, 5)
-#define IPU_FIELD_OFS1          IPU_CPMEM_WORD(1, 133, 5)
-#define IPU_FIELD_OFS2          IPU_CPMEM_WORD(1, 138, 5)
-#define IPU_FIELD_OFS3          IPU_CPMEM_WORD(1, 143, 5)
-#define IPU_FIELD_SXYS          IPU_CPMEM_WORD(1, 148, 1)
-#define IPU_FIELD_CRE           IPU_CPMEM_WORD(1, 149, 1)
-#define IPU_FIELD_DEC_SEL2      IPU_CPMEM_WORD(1, 150, 1)
-
-struct ipu_cpmem_word {
-        u32 data[5];
-        u32 res[3];
-};
-
-struct ipu_ch_param {
-        struct ipu_cpmem_word word[2];
-};
-
-void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v);
-u32 ipu_ch_param_read_field(struct ipu_ch_param __iomem *base, u32 wbs);
-struct ipu_ch_param __iomem *ipu_get_cpmem(struct ipuv3_channel *channel);
-void ipu_ch_param_dump(struct ipu_ch_param __iomem *p);
-
-static inline void ipu_ch_param_zero(struct ipu_ch_param __iomem *p)
-{
-        int i;
-        void __iomem *base = p;
-
-        for (i = 0; i < sizeof(*p) / sizeof(u32); i++)
-                writel(0, base + i * sizeof(u32));
-}
-
-static inline void ipu_cpmem_set_buffer(struct ipu_ch_param __iomem *p,
-                int bufnum, dma_addr_t buf)
-{
-        if (bufnum)
-                ipu_ch_param_write_field(p, IPU_FIELD_EBA1, buf >> 3);
-        else
-                ipu_ch_param_write_field(p, IPU_FIELD_EBA0, buf >> 3);
-}
-
-static inline void ipu_cpmem_set_resolution(struct ipu_ch_param __iomem *p,
-                int xres, int yres)
-{
-        ipu_ch_param_write_field(p, IPU_FIELD_FW, xres - 1);
-        ipu_ch_param_write_field(p, IPU_FIELD_FH, yres - 1);
-}
-
-static inline void ipu_cpmem_set_stride(struct ipu_ch_param __iomem *p,
-                int stride)
-{
-        ipu_ch_param_write_field(p, IPU_FIELD_SLY, stride - 1);
-}
-
-void ipu_cpmem_set_high_priority(struct ipuv3_channel *channel);
-
-struct ipu_rgb {
-        struct fb_bitfield      red;
-        struct fb_bitfield      green;
-        struct fb_bitfield      blue;
-        struct fb_bitfield      transp;
-        int                     bits_per_pixel;
-};
-
-struct ipu_image {
-        struct v4l2_pix_format pix;
-        struct v4l2_rect rect;
-        dma_addr_t phys;
+enum ipu_ic_task {
+        IC_TASK_ENCODER,
+        IC_TASK_VIEWFINDER,
+        IC_TASK_POST_PROCESSOR,
+        IC_NUM_TASKS,
 };
 
-int ipu_cpmem_set_format_passthrough(struct ipu_ch_param __iomem *p,
-                int width);
-
-int ipu_cpmem_set_format_rgb(struct ipu_ch_param __iomem *,
-                const struct ipu_rgb *rgb);
-
-static inline void ipu_cpmem_interlaced_scan(struct ipu_ch_param *p,
-                int stride)
-{
-        ipu_ch_param_write_field(p, IPU_FIELD_SO, 1);
-        ipu_ch_param_write_field(p, IPU_FIELD_ILO, stride / 8);
-        ipu_ch_param_write_field(p, IPU_FIELD_SLY, (stride * 2) - 1);
-};
+struct ipu_ic;
+int ipu_ic_task_init(struct ipu_ic *ic,
+                     int in_width, int in_height,
+                     int out_width, int out_height,
+                     enum ipu_color_space in_cs,
+                     enum ipu_color_space out_cs);
+int ipu_ic_task_graphics_init(struct ipu_ic *ic,
+                              enum ipu_color_space in_g_cs,
+                              bool galpha_en, u32 galpha,
+                              bool colorkey_en, u32 colorkey);
+void ipu_ic_task_enable(struct ipu_ic *ic);
+void ipu_ic_task_disable(struct ipu_ic *ic);
+int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel,
+                          u32 width, u32 height, int burst_size,
+                          enum ipu_rotate_mode rot);
+int ipu_ic_enable(struct ipu_ic *ic);
+int ipu_ic_disable(struct ipu_ic *ic);
+struct ipu_ic *ipu_ic_get(struct ipu_soc *ipu, enum ipu_ic_task task);
+void ipu_ic_put(struct ipu_ic *ic);
+void ipu_ic_dump(struct ipu_ic *ic);
 
-void ipu_cpmem_set_yuv_planar(struct ipu_ch_param __iomem *p, u32 pixel_format,
-                        int stride, int height);
-void ipu_cpmem_set_yuv_interleaved(struct ipu_ch_param __iomem *p,
-                                   u32 pixel_format);
-void ipu_cpmem_set_yuv_planar_full(struct ipu_ch_param __iomem *p,
-                u32 pixel_format, int stride, int u_offset, int v_offset);
-int ipu_cpmem_set_fmt(struct ipu_ch_param __iomem *cpmem, u32 pixelformat);
-int ipu_cpmem_set_image(struct ipu_ch_param __iomem *cpmem,
-                struct ipu_image *image);
+/*
+ * IPU Sensor Multiple FIFO Controller (SMFC) functions
+ */
+struct ipu_smfc *ipu_smfc_get(struct ipu_soc *ipu, unsigned int chno);
+void ipu_smfc_put(struct ipu_smfc *smfc);
+int ipu_smfc_enable(struct ipu_smfc *smfc);
+int ipu_smfc_disable(struct ipu_smfc *smfc);
+int ipu_smfc_map_channel(struct ipu_smfc *smfc, int csi_id, int mipi_id);
+int ipu_smfc_set_burstsize(struct ipu_smfc *smfc, int burstsize);
+int ipu_smfc_set_watermark(struct ipu_smfc *smfc, u32 set_level, u32 clr_level);
 
 enum ipu_color_space ipu_drm_fourcc_to_colorspace(u32 drm_fourcc);
 enum ipu_color_space ipu_pixelformat_to_colorspace(u32 pixelformat);
-
-static inline void ipu_cpmem_set_burstsize(struct ipu_ch_param __iomem *p,
-                int burstsize)
-{
-        ipu_ch_param_write_field(p, IPU_FIELD_NPB, burstsize - 1);
-};
+enum ipu_color_space ipu_mbus_code_to_colorspace(u32 mbus_code);
+int ipu_stride_to_bytes(u32 pixel_stride, u32 pixelformat);
+bool ipu_pixelformat_is_planar(u32 pixelformat);
+int ipu_degrees_to_rot_mode(enum ipu_rotate_mode *mode, int degrees,
+                            bool hflip, bool vflip);
+int ipu_rot_mode_to_degrees(int *degrees, enum ipu_rotate_mode mode,
+                            bool hflip, bool vflip);
 
 struct ipu_client_platformdata {
         int csi;