media: qcom: camss: vfe-340: Proper client handling

We need to properly map camss WM index to our internal WM client
instance. Today we only support RDI interfaces with the RDI_WM
macro, introduce a __wm_to_client helper to support any interface.

Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-340.c b/drivers/media/platform/qcom/camss/camss-vfe-340.c
index 30d7630b3e8b3737943e3c8ade32f53ed44127c8..d129b0d3a6edb0e36860b23032196be61f0e1206 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-340.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-340.c
@@ -69,24 +69,19 @@
 #define TFE_BUS_FRAMEDROP_CFG_0(c)                     BUS_REG(0x238 + (c) * 0x100)
 #define TFE_BUS_FRAMEDROP_CFG_1(c)                     BUS_REG(0x23c + (c) * 0x100)
 
-/*
- * TODO: differentiate the port id based on requested type of RDI, BHIST etc
- *
- * TFE write master IDs (clients)
- *
- * BAYER               0
- * IDEAL_RAW           1
- * STATS_TINTLESS_BG   2
- * STATS_BHIST         3
- * STATS_AWB_BG                4
- * STATS_AEC_BG                5
- * STATS_BAF           6
- * RDI0                        7
- * RDI1                        8
- * RDI2                        9
- */
-#define RDI_WM(n)              (7 + (n))
-#define TFE_WM_NUM             10
+enum tfe_client {
+       TFE_CLI_BAYER,
+       TFE_CLI_IDEAL_RAW,
+       TFE_CLI_STATS_TINTLESS_BG,
+       TFE_CLI_STATS_BHIST,
+       TFE_CLI_STATS_AWB_BG,
+       TFE_CLI_STATS_AEC_BG,
+       TFE_CLI_STATS_BAF,
+       TFE_CLI_RDI0,
+       TFE_CLI_RDI1,
+       TFE_CLI_RDI2,
+       TFE_CLI_NUM
+};
 
 enum tfe_iface {
        TFE_IFACE_PIX,
@@ -108,6 +103,13 @@ enum tfe_subgroups {
        TFE_SUBGROUP_NUM
 };
 
+static enum tfe_client tfe_wm_client_map[VFE_LINE_NUM_MAX] = {
+       [VFE_LINE_RDI0] = TFE_CLI_RDI0,
+       [VFE_LINE_RDI1] = TFE_CLI_RDI1,
+       [VFE_LINE_RDI2] = TFE_CLI_RDI2,
+       [VFE_LINE_PIX] = TFE_CLI_BAYER,
+};
+
 static enum tfe_iface tfe_line_iface_map[VFE_LINE_NUM_MAX] = {
        [VFE_LINE_RDI0] = TFE_IFACE_RDI0,
        [VFE_LINE_RDI1] = TFE_IFACE_RDI1,
@@ -209,10 +211,10 @@ static irqreturn_t vfe_isr(int irq, void *dev)
        status = readl_relaxed(vfe->base + TFE_BUS_OVERFLOW_STATUS);
        if (status) {
                writel_relaxed(status, vfe->base + TFE_BUS_STATUS_CLEAR);
-               for (i = 0; i < TFE_WM_NUM; i++) {
+               for (i = 0; i < TFE_CLI_NUM; i++) {
                        if (status & BIT(i))
                                dev_err_ratelimited(vfe->camss->dev,
-                                                   "VFE%u: bus overflow for wm %u\n",
+                                                   "VFE%u: bus overflow for client %u\n",
                                                    vfe->id, i);
                }
        }
@@ -235,49 +237,49 @@ static void vfe_enable_irq(struct vfe_device *vfe)
               TFE_BUS_IRQ_MASK_0_IMG_VIOL, vfe->base + TFE_BUS_IRQ_MASK_0);
 }
 
-static void vfe_wm_update(struct vfe_device *vfe, u8 rdi, u32 addr,
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
                          struct vfe_line *line)
 {
-       u8 wm = RDI_WM(rdi);
+       u8 client = tfe_wm_client_map[wm];
 
-       writel_relaxed(addr, vfe->base + TFE_BUS_IMAGE_ADDR(wm));
+       writel_relaxed(addr, vfe->base + TFE_BUS_IMAGE_ADDR(client));
 }
 
-static void vfe_wm_start(struct vfe_device *vfe, u8 rdi, struct vfe_line *line)
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
 {
        struct v4l2_pix_format_mplane *pix = &line->video_out.active_fmt.fmt.pix_mp;
        u32 stride = pix->plane_fmt[0].bytesperline;
-       u8 wm = RDI_WM(rdi);
+       u8 client = tfe_wm_client_map[wm];
 
        /* Configuration for plain RDI frames */
-       writel_relaxed(TFE_BUS_IMAGE_CFG_0_DEFAULT, vfe->base + TFE_BUS_IMAGE_CFG_0(wm));
-       writel_relaxed(0u, vfe->base + TFE_BUS_IMAGE_CFG_1(wm));
-       writel_relaxed(TFE_BUS_IMAGE_CFG_2_DEFAULT, vfe->base + TFE_BUS_IMAGE_CFG_2(wm));
-       writel_relaxed(stride * pix->height, vfe->base + TFE_BUS_FRAME_INCR(wm));
-       writel_relaxed(TFE_BUS_PACKER_CFG_FMT_PLAIN64, vfe->base + TFE_BUS_PACKER_CFG(wm));
+       writel_relaxed(TFE_BUS_IMAGE_CFG_0_DEFAULT, vfe->base + TFE_BUS_IMAGE_CFG_0(client));
+       writel_relaxed(0u, vfe->base + TFE_BUS_IMAGE_CFG_1(client));
+       writel_relaxed(TFE_BUS_IMAGE_CFG_2_DEFAULT, vfe->base + TFE_BUS_IMAGE_CFG_2(client));
+       writel_relaxed(stride * pix->height, vfe->base + TFE_BUS_FRAME_INCR(client));
+       writel_relaxed(TFE_BUS_PACKER_CFG_FMT_PLAIN64, vfe->base + TFE_BUS_PACKER_CFG(client));
 
        /* No dropped frames, one irq per frame */
-       writel_relaxed(0, vfe->base + TFE_BUS_FRAMEDROP_CFG_0(wm));
-       writel_relaxed(1, vfe->base + TFE_BUS_FRAMEDROP_CFG_1(wm));
-       writel_relaxed(0, vfe->base + TFE_BUS_IRQ_SUBSAMPLE_CFG_0(wm));
-       writel_relaxed(1, vfe->base + TFE_BUS_IRQ_SUBSAMPLE_CFG_1(wm));
+       writel_relaxed(0, vfe->base + TFE_BUS_FRAMEDROP_CFG_0(client));
+       writel_relaxed(1, vfe->base + TFE_BUS_FRAMEDROP_CFG_1(client));
+       writel_relaxed(0, vfe->base + TFE_BUS_IRQ_SUBSAMPLE_CFG_0(client));
+       writel_relaxed(1, vfe->base + TFE_BUS_IRQ_SUBSAMPLE_CFG_1(client));
 
        vfe_enable_irq(vfe);
 
        writel(TFE_BUS_CLIENT_CFG_EN | TFE_BUS_CLIENT_CFG_MODE_FRAME,
-              vfe->base + TFE_BUS_CLIENT_CFG(wm));
+              vfe->base + TFE_BUS_CLIENT_CFG(client));
 
-       dev_dbg(vfe->camss->dev, "VFE%u: Started RDI%u width %u height %u stride %u\n",
-               vfe->id, rdi, pix->width, pix->height, stride);
+       dev_dbg(vfe->camss->dev, "VFE%u: Started client %u width %u height %u stride %u\n",
+               vfe->id, client, pix->width, pix->height, client);
 }
 
-static void vfe_wm_stop(struct vfe_device *vfe, u8 rdi)
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
 {
-       u8 wm = RDI_WM(rdi);
+       u8 client = tfe_wm_client_map[wm];
 
-       writel(0, vfe->base + TFE_BUS_CLIENT_CFG(wm));
+       writel(0, vfe->base + TFE_BUS_CLIENT_CFG(client));
 
-       dev_dbg(vfe->camss->dev, "VFE%u: Stopped RDI%u\n", vfe->id, rdi);
+       dev_dbg(vfe->camss->dev, "VFE%u: Stopped client %u\n", vfe->id, client);
 }
 
 static const struct camss_video_ops vfe_video_ops_520 = {