Skip to contentSkip to conversation

Add support for the SDM845 Camera Subsystem

PATCH Superseded Robert Foss 3 participants 51 messages Feb 17, 2021 – Feb 24, 2021 Page 1 of 2

Subsystems (6)

v5 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v5 cover Add support for the SDM845 Camera Subsystem

This series implements support for the camera subsystem found in the SDM845 SOCs and the Titan 170 ISP. The support is partial in that it implements CSIPHY, CSID, and partial VFE support.

The Titan generation of the ISP diverges a fair amount from the design of the previous architecture generation, CAMSS. As a result some pretty invasive refactoring is done in this series. It also means that at this time we're unable to implement support for all of the IP blocks contained. This is due to a combination of legal considerations with respect to the IP and its owner Qualcomm and time & man hour constrains on the Linaro side.

The CSIPHY (CSI Physical Layer) & CSID (CSI Decoder) support is complete, but the VFE (Video Front End, which is referred to as IFE (Image Front End) in the Titan generation of ISPs) only has support for the RDI (Raw Dump Interface) which allows the raw output of the CSID to be written to memory.

The 2nd interface implemented in the VFE silicon is the PIX interface, and camss does not support it for this generation of ISPs. The reason for this is that the PIX interface is used for sending image data to the BPS (Bayer Processing Section) & IPE (Image Processing Engine), but both of these units are beyond the scope of enabling basic ISP functionality for the SDM845.

Since the Titan architecture generation diverges quite a bit from the CAMSS generation, a lot of pretty major refactoring is carried out in this series. Both the CSID & VFE core paths are made more general and hardware version specific parts are broken out. The CSIPHY didn't require quite as radical changes and therefore keeps its current form.

Tested on:
- Qcom RB3 / db845c + camera mezzanine, which is SDM845 based
- db410c + D3 Camera mezzanine, which is APQ8016 based

Branch:
- https://git.linaro.org/people/robert.foss/linux.git/log/?h=camss_sdm845_v1
- https://git.linaro.org/people/robert.foss/linux.git/log/?h=camss_sdm845_v2
- https://git.linaro.org/people/robert.foss/linux.git/log/?h=camss_sdm845_v3
- https://git.linaro.org/people/robert.foss/linux.git/log/?h=camss_sdm845_v4
- https://git.linaro.org/people/robert.foss/linux.git/log/?h=camss_sdm845_v5

Due to the dt-bindings supporting sdm660-camss, this series depends the sdm660 clock driver being upstreamed. I've linked this series below.

SDM630/660 Multimedia and GPU clock controllers
https://patchwork.kernel.org/project/linux-arm-msm/list/?series=366077

Robert Foss (22):
media: camss: Fix vfe_isr_comp_done() documentation
media: camss: Fix vfe_isr comment typo
media: camss: Replace trace_printk() with dev_dbg()
media: camss: Add CAMSS_845 camss version
media: camss: Make ISPIF subdevice optional
media: camss: Refactor VFE HW version support
media: camss: Add support for VFE hardware version Titan 170
media: camss: Add missing format identifiers
media: camss: Refactor CSID HW version support
media: camss: Add support for CSID hardware version Titan 170
media: camss: Add support for CSIPHY hardware version Titan 170
media: camss: Remove per VFE power domain toggling
media: camss: Enable SDM845
dt-bindings: media: camss: Add qcom,msm8916-camss binding
dt-bindings: media: camss: Add qcom,msm8996-camss binding
dt-bindings: media: camss: Add qcom,sdm660-camss binding
dt-bindings: media: camss: Add qcom,sdm845-camss binding
MAINTAINERS: Change CAMSS documentation to use dtschema bindings
media: dt-bindings: media: Remove qcom,camss documentation
arm64: dts: sdm845: Add CAMSS ISP node
arm64: dts: sdm845-db845c: Configure regulators for camss node
arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP

 .../devicetree/bindings/media/qcom,camss.txt  |  236 ----
 .../bindings/media/qcom,msm8916-camss.yaml    |  256 ++++
 .../bindings/media/qcom,msm8996-camss.yaml    |  387 ++++++
 .../bindings/media/qcom,sdm660-camss.yaml     |  398 ++++++
 .../bindings/media/qcom,sdm845-camss.yaml     |  370 ++++++
 MAINTAINERS                                   |    2 +-
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts    |   23 +-
 arch/arm64/boot/dts/qcom/sdm845.dtsi          |  135 ++
 drivers/media/platform/qcom/camss/Makefile    |    6 +
 .../platform/qcom/camss/camss-csid-170.c      |  602 +++++++++
 .../platform/qcom/camss/camss-csid-4-1.c      |  330 +++++
 .../platform/qcom/camss/camss-csid-4-7.c      |  406 ++++++
 .../media/platform/qcom/camss/camss-csid.c    |  620 +--------
 .../media/platform/qcom/camss/camss-csid.h    |  178 ++-
 .../qcom/camss/camss-csiphy-3ph-1-0.c         |  182 ++-
 .../media/platform/qcom/camss/camss-csiphy.c  |   66 +-
 .../media/platform/qcom/camss/camss-ispif.c   |  122 +-
 .../media/platform/qcom/camss/camss-ispif.h   |    3 +-
 .../media/platform/qcom/camss/camss-vfe-170.c |  789 +++++++++++
 .../media/platform/qcom/camss/camss-vfe-4-1.c |  125 +-
 .../media/platform/qcom/camss/camss-vfe-4-7.c |  246 ++--
 .../media/platform/qcom/camss/camss-vfe-4-8.c | 1166 +++++++++++++++++
 .../platform/qcom/camss/camss-vfe-gen1.c      |  763 +++++++++++
 .../platform/qcom/camss/camss-vfe-gen1.h      |  110 ++
 drivers/media/platform/qcom/camss/camss-vfe.c |  848 +-----------
 drivers/media/platform/qcom/camss/camss-vfe.h |  127 +-
 .../media/platform/qcom/camss/camss-video.c   |   52 +
 drivers/media/platform/qcom/camss/camss.c     |  407 ++++--
 drivers/media/platform/qcom/camss/camss.h     |   17 +-
 29 files changed, 6901 insertions(+), 2071 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/qcom,camss.txt
 create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml
 create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml
 create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml
 create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
 create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h
Signature · 1 line
2.27.0
#1 lore raw

PATCH v5 1/22 media: camss: Fix vfe_isr_comp_done() documentation

Function name is comment is wrong, and was changed to be the same as the actual function name.

The comment was changed to kerneldoc format.

---

Changes since v1
- Bjorn: Fix function doc name & use kerneldoc format

 drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -2
index fae2b513b2f9..94c9ca7d5cbb 100644
@@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
 	spin_unlock_irqrestore(&vfe->output_lock, flags);
 }
 
-/*
- * vfe_isr_wm_done - Process composite image done interrupt
+/**
+ * vfe_isr_comp_done() - Process composite image done interrupt
  * @vfe: VFE Device
  * @comp: Composite image id
  */
Signature · 1 line
2.27.0
#2 lore raw

Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation

Hi Robert,

not really a review, but I noticed ....

Le mercredi 17 février 2021 à 12:21 +0100, Robert Foss a écrit :

Quoted 1 line

Function name is comment is wrong, and was changed to be

in

Quoted 31 lines

the same as the actual function name.

The comment was changed to kerneldoc format.

---

Changes since v1
 - Bjorn: Fix function doc name & use kerneldoc format

 drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe.c +0 -0
index fae2b513b2f9..94c9ca7d5cbb 100644
@@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8
 wm)
         spin_unlock_irqrestore(&vfe->output_lock, flags);
  }

drivers/media/platform/qcom/camss/camss-vfe.c +2 -2
-/*
- * vfe_isr_wm_done - Process composite image done interrupt
+/**
+ * vfe_isr_comp_done() - Process composite image done interrupt

  * @vfe: VFE Device
  * @comp: Composite image id
  */

#3 lore raw

Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation

Quoted 9 lines · Nicolas Dufresne

Hi Robert,

not really a review, but I noticed ....

Quoted 1 line · Robert Foss

Function name is comment is wrong, and was changed to be

in

Thanks bud!

Quoted 34 lines
Quoted 32 lines

the same as the actual function name.

The comment was changed to kerneldoc format.

---

Changes since v1
- Bjorn: Fix function doc name & use kerneldoc format

 drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -2
index fae2b513b2f9..94c9ca7d5cbb 100644
@@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8
 wm)
        spin_unlock_irqrestore(&vfe->output_lock, flags);
 }
 
-/*
- * vfe_isr_wm_done - Process composite image done interrupt
+/**
+ * vfe_isr_comp_done() - Process composite image done interrupt
  * @vfe: VFE Device
  * @comp: Composite image id

*/

Reviewed-by on v5 1/22
#4 lore raw

Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation

In reply to Robert Foss

Hi Robert,

Thanks,
Andrey

Quoted 31 lines · Robert Foss

Function name is comment is wrong, and was changed to be the same as the actual function name.

The comment was changed to kerneldoc format.

---

Changes since v1
- Bjorn: Fix function doc name & use kerneldoc format

  drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -2
index fae2b513b2f9..94c9ca7d5cbb 100644
@@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
  	spin_unlock_irqrestore(&vfe->output_lock, flags);
  }
 
-/*
- * vfe_isr_wm_done - Process composite image done interrupt
+/**
+ * vfe_isr_comp_done() - Process composite image done interrupt
   * @vfe: VFE Device
   * @comp: Composite image id
   */
#5 lore raw

PATCH v5 2/22 media: camss: Fix vfe_isr comment typo

In reply to Robert Foss

Comment refers to ISPIF, but this is incorrect. Only the VFE interrupts are handled by this function.

---

Changes since v1
- Bjorn: Add r-b

 drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 2 +-
 drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +1 -1
index 174a36be6f5d..a1b56b89130d 100644
@@ -922,7 +922,7 @@ static void vfe_violation_read(struct vfe_device *vfe)
 }
 
 /*
- * vfe_isr - ISPIF module interrupt handler
+ * vfe_isr - VFE module interrupt handler
  * @irq: Interrupt line
  * @dev: VFE device
  *
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +1 -1
index b5704a2f119b..84c33b8f9fe3 100644
@@ -1055,7 +1055,7 @@ static void vfe_violation_read(struct vfe_device *vfe)
 }
 
 /*
- * vfe_isr - ISPIF module interrupt handler
+ * vfe_isr - VFE module interrupt handler
  * @irq: Interrupt line
  * @dev: VFE device
  *
Signature · 1 line
2.27.0
#6 lore raw

PATCH v5 3/22 media: camss: Replace trace_printk() with dev_dbg()

In reply to Robert Foss

trace_printk() should not be used in production code, since extra memory is used for special buffers whenever trace_puts() is used.

Replace it with dev_dbg() which provides all of the desired debugging functionality.

---

Changes since v3:
- Nicolas: Create this patch

Changes since v4:
- Nicolas: Added r-b

 drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 5 +++--
 drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +3 -2
index a1b56b89130d..85b9bcbc7321 100644
@@ -12,6 +12,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 
+#include "camss.h"
 #include "camss-vfe.h"
 
 #define VFE_0_HW_VERSION		0x000
@@ -936,8 +937,8 @@ static irqreturn_t vfe_isr(int irq, void *dev)
 
 	vfe->ops->isr_read(vfe, &value0, &value1);
 
-	trace_printk("VFE: status0 = 0x%08x, status1 = 0x%08x\n",
-		     value0, value1);
+	dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+		value0, value1);
 
 	if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
 		vfe->isr_ops.reset_ack(vfe);
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +3 -2
index 84c33b8f9fe3..f7e00a2de393 100644
@@ -12,6 +12,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 
+#include "camss.h"
 #include "camss-vfe.h"
 
 #define VFE_0_HW_VERSION		0x000
@@ -1069,8 +1070,8 @@ static irqreturn_t vfe_isr(int irq, void *dev)
 
 	vfe->ops->isr_read(vfe, &value0, &value1);
 
-	trace_printk("VFE: status0 = 0x%08x, status1 = 0x%08x\n",
-		     value0, value1);
+	dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+		value0, value1);
 
 	if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
 		vfe->isr_ops.reset_ack(vfe);
Signature · 1 line
2.27.0
#7 lore raw

PATCH v5 4/22 media: camss: Add CAMSS_845 camss version

In reply to Robert Foss

Add enum representing the SDM845 SOC, which incorporates version 170 of the Titan architecture ISP.

---
 drivers/media/platform/qcom/camss/camss.h | 1 +
 1 file changed, 1 insertion(+)
drivers/media/platform/qcom/camss/camss.h +1 -0
index 3a0484683cd6..46e986452824 100644
@@ -66,6 +66,7 @@ enum camss_version {
 	CAMSS_8x16,
 	CAMSS_8x96,
 	CAMSS_660,
+	CAMSS_845,
 };
 
 struct camss {
Signature · 1 line
2.27.0
Reviewed-by on v5 4/22
#8 lore raw

Re: [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version

Hi Robert,

Thanks,
Andrey

Quoted 21 lines · Robert Foss

Add enum representing the SDM845 SOC, which incorporates version 170 of the Titan architecture ISP.

---
  drivers/media/platform/qcom/camss/camss.h | 1 +
  1 file changed, 1 insertion(+)
drivers/media/platform/qcom/camss/camss.h +1 -0
index 3a0484683cd6..46e986452824 100644
@@ -66,6 +66,7 @@ enum camss_version {
  	CAMSS_8x16,
  	CAMSS_8x96,
  	CAMSS_660,
+	CAMSS_845,
  };
 
  struct camss {
#9 lore raw

PATCH v5 5/22 media: camss: Make ISPIF subdevice optional

In reply to Robert Foss

This driver supports multiple architecture versions of the Qualcomm ISP. The CAMSS architecure which this driver is name after, and with the introduction of this series, the Titan architecture.

The ISPIF is an IP-block that is only present in the CAMSS generation of the architecture. In order to support the Titan generation, make the ISPIF an optional subdevice.

---

Changes since v1:
- Björn: Improved commit message
- Björn: Use local 'dev' ptr instead of 'camss->dev'
- Björn: Remove res/ispif NULL checks
- Björn: Remove ispif NULL checks before calling msm_ispif_unregister_entities()
- Andrey: Fixed incorrect allocation size

Changes since v4:
- Andrey: Remove !camss->ispif conditional from camss.c
- Andrey: Fix !camss->ispif in camss-ispif.c
- Move !camss->ispif check to msm_ispif_subdev_init()

 .../media/platform/qcom/camss/camss-ispif.c   | 119 +++++++++++-------
 .../media/platform/qcom/camss/camss-ispif.h   |   3 +-
 drivers/media/platform/qcom/camss/camss.c     |  99 ++++++++++-----
 drivers/media/platform/qcom/camss/camss.h     |   2 +-
 4 files changed, 139 insertions(+), 84 deletions(-)
drivers/media/platform/qcom/camss/camss-ispif.c +71 -48
index adeb92808998..fc121da4ab0c 100644
@@ -161,6 +161,7 @@ static const u32 ispif_formats_8x96[] = {
 static irqreturn_t ispif_isr_8x96(int irq, void *dev)
 {
 	struct ispif_device *ispif = dev;
+	struct camss *camss = ispif->camss;
 	u32 value0, value1, value2, value3, value4, value5;
 
 	value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -186,34 +187,34 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
 		complete(&ispif->reset_complete[1]);
 
 	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
 
 	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
 
 	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
 
 	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
 
 	if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
 
 	if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 pix0 overflow\n");
 
 	if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi0 overflow\n");
 
 	if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 pix1 overflow\n");
 
 	if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi1 overflow\n");
 
 	if (unlikely(value5 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi2 overflow\n");
 
 	return IRQ_HANDLED;
 }
@@ -228,6 +229,7 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
 static irqreturn_t ispif_isr_8x16(int irq, void *dev)
 {
 	struct ispif_device *ispif = dev;
+	struct camss *camss = ispif->camss;
 	u32 value0, value1, value2;
 
 	value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -244,30 +246,32 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)
 		complete(&ispif->reset_complete[0]);
 
 	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
 
 	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
 
 	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
 
 	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
 
 	if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
 
 	return IRQ_HANDLED;
 }
 
 static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
 {
+	struct camss *camss = ispif->camss;
+
 	unsigned long time;
 	u32 val;
 
-	if (vfe_id > (to_camss(ispif)->vfe_num - 1)) {
-		dev_err(to_device(ispif),
+	if (vfe_id > (camss->vfe_num - 1)) {
+		dev_err(camss->dev,
 			"Error: asked reset for invalid VFE%d\n", vfe_id);
 		return -ENOENT;
 	}
@@ -300,7 +304,7 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
 	time = wait_for_completion_timeout(&ispif->reset_complete[vfe_id],
 		msecs_to_jiffies(ISPIF_RESET_TIMEOUT_MS));
 	if (!time) {
-		dev_err(to_device(ispif),
+		dev_err(camss->dev,
 			"ISPIF for VFE%d reset timeout\n", vfe_id);
 		return -EIO;
 	}
@@ -316,30 +320,31 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
  */
 static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
 {
+	struct camss *camss = ispif->camss;
 	int ret;
 
-	ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE0);
+	ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
 	if (ret < 0)
 		return ret;
 
-	ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE1);
+	ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
 	if (ret < 0)
 		return ret;
 
 	ret = camss_enable_clocks(ispif->nclocks_for_reset,
 				  ispif->clock_for_reset,
-				  to_device(ispif));
+				  camss->dev);
 	if (ret < 0)
 		return ret;
 
 	ret = ispif_vfe_reset(ispif, vfe_id);
 	if (ret)
-		dev_dbg(to_device(ispif), "ISPIF Reset failed\n");
+		dev_dbg(camss->dev, "ISPIF Reset failed\n");
 
 	camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
 
-	camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE0);
-	camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE1);
+	camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
+	camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
 
 	return ret;
 }
@@ -355,7 +360,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on)
 {
 	struct ispif_line *line = v4l2_get_subdevdata(sd);
 	struct ispif_device *ispif = line->ispif;
-	struct device *dev = to_device(ispif);
+	struct device *dev = ispif->camss->dev;
 	int ret = 0;
 
 	mutex_lock(&ispif->power_lock);
@@ -505,7 +510,7 @@ static int ispif_validate_intf_status(struct ispif_device *ispif,
 	}
 
 	if ((val & 0xf) != 0xf) {
-		dev_err(to_device(ispif), "%s: ispif is busy: 0x%x\n",
+		dev_err(ispif->camss->dev, "%s: ispif is busy: 0x%x\n",
 			__func__, val);
 		ret = -EBUSY;
 	}
@@ -552,7 +557,7 @@ static int ispif_wait_for_stop(struct ispif_device *ispif,
 				 ISPIF_TIMEOUT_SLEEP_US,
 				 ISPIF_TIMEOUT_ALL_US);
 	if (ret < 0)
-		dev_err(to_device(ispif), "%s: ispif stop timeout\n",
+		dev_err(ispif->camss->dev, "%s: ispif stop timeout\n",
 			__func__);
 
 	return ret;
@@ -800,6 +805,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
 {
 	struct ispif_line *line = v4l2_get_subdevdata(sd);
 	struct ispif_device *ispif = line->ispif;
+	struct camss *camss = ispif->camss;
 	enum ispif_intf intf = line->interface;
 	u8 csid = line->csid_id;
 	u8 vfe = line->vfe_id;
@@ -825,8 +831,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
 		ispif_select_csid(ispif, intf, csid, vfe, 1);
 		ispif_select_cid(ispif, intf, cid, vfe, 1);
 		ispif_config_irq(ispif, intf, vfe, 1);
-		if (to_camss(ispif)->version == CAMSS_8x96 ||
-		    to_camss(ispif)->version == CAMSS_660)
+		if (camss->version == CAMSS_8x96 ||
+		    camss->version == CAMSS_660)
 			ispif_config_pack(ispif,
 					  line->fmt[MSM_ISPIF_PAD_SINK].code,
 					  intf, cid, vfe, 1);
@@ -843,8 +849,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
 			return ret;
 
 		mutex_lock(&ispif->config_lock);
-		if (to_camss(ispif)->version == CAMSS_8x96 ||
-		    to_camss(ispif)->version == CAMSS_660)
+		if (camss->version == CAMSS_8x96 ||
+		    camss->version == CAMSS_660)
 			ispif_config_pack(ispif,
 					  line->fmt[MSM_ISPIF_PAD_SINK].code,
 					  intf, cid, vfe, 0);
@@ -1088,26 +1094,32 @@ static int ispif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
  *
  * Return 0 on success or a negative error code otherwise
  */
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
 			  const struct resources_ispif *res)
 {
-	struct device *dev = to_device(ispif);
+	struct device *dev = camss->dev;
+	struct ispif_device *ispif = camss->ispif;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct resource *r;
 	int i;
 	int ret;
 
+	if (!camss->ispif)
+		return 0;
+
+	ispif->camss = camss;
+
 	/* Number of ISPIF lines - same as number of CSID hardware modules */
-	if (to_camss(ispif)->version == CAMSS_8x16)
+	if (camss->version == CAMSS_8x16)
 		ispif->line_num = 2;
-	else if (to_camss(ispif)->version == CAMSS_8x96 ||
-		 to_camss(ispif)->version == CAMSS_660)
+	else if (camss->version == CAMSS_8x96 ||
+		 camss->version == CAMSS_660)
 		ispif->line_num = 4;
 	else
 		return -EINVAL;
 
-	ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),
-				   GFP_KERNEL);
+	ispif->line = devm_kcalloc(dev, ispif->line_num,
+			sizeof(*ispif->line), GFP_KERNEL);
 	if (!ispif->line)
 		return -ENOMEM;
 
@@ -1115,12 +1127,12 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
 		ispif->line[i].ispif = ispif;
 		ispif->line[i].id = i;
 
-		if (to_camss(ispif)->version == CAMSS_8x16) {
+		if (camss->version == CAMSS_8x16) {
 			ispif->line[i].formats = ispif_formats_8x16;
 			ispif->line[i].nformats =
 					ARRAY_SIZE(ispif_formats_8x16);
-		} else if (to_camss(ispif)->version == CAMSS_8x96 ||
-			   to_camss(ispif)->version == CAMSS_660) {
+		} else if (camss->version == CAMSS_8x96 ||
+			   camss->version == CAMSS_660) {
 			ispif->line[i].formats = ispif_formats_8x96;
 			ispif->line[i].nformats =
 					ARRAY_SIZE(ispif_formats_8x96);
@@ -1157,15 +1169,16 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
 	ispif->irq = r->start;
 	snprintf(ispif->irq_name, sizeof(ispif->irq_name), "%s_%s",
 		 dev_name(dev), MSM_ISPIF_NAME);
-	if (to_camss(ispif)->version == CAMSS_8x16)
+	if (camss->version == CAMSS_8x16)
 		ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16,
 			       IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
-	else if (to_camss(ispif)->version == CAMSS_8x96 ||
-		 to_camss(ispif)->version == CAMSS_660)
+	else if (camss->version == CAMSS_8x96 ||
+		 camss->version == CAMSS_660)
 		ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96,
 			       IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
 	else
 		ret = -EINVAL;
+
 	if (ret < 0) {
 		dev_err(dev, "request_irq failed: %d\n", ret);
 		return ret;
@@ -1331,10 +1344,15 @@ static const struct media_entity_operations ispif_media_ops = {
 int msm_ispif_register_entities(struct ispif_device *ispif,
 				struct v4l2_device *v4l2_dev)
 {
-	struct device *dev = to_device(ispif);
+	struct camss *camss;
 	int ret;
 	int i;
 
+	if (!ispif)
+		return 0;
+
+	camss = ispif->camss;
+
 	for (i = 0; i < ispif->line_num; i++) {
 		struct v4l2_subdev *sd = &ispif->line[i].subdev;
 		struct media_pad *pads = ispif->line[i].pads;
@@ -1348,7 +1366,7 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
 
 		ret = ispif_init_formats(sd, NULL);
 		if (ret < 0) {
-			dev_err(dev, "Failed to init format: %d\n", ret);
+			dev_err(camss->dev, "Failed to init format: %d\n", ret);
 			goto error;
 		}
 
@@ -1360,13 +1378,15 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
 		ret = media_entity_pads_init(&sd->entity, MSM_ISPIF_PADS_NUM,
 					     pads);
 		if (ret < 0) {
-			dev_err(dev, "Failed to init media entity: %d\n", ret);
+			dev_err(camss->dev, "Failed to init media entity: %d\n",
+				ret);
 			goto error;
 		}
 
 		ret = v4l2_device_register_subdev(v4l2_dev, sd);
 		if (ret < 0) {
-			dev_err(dev, "Failed to register subdev: %d\n", ret);
+			dev_err(camss->dev, "Failed to register subdev: %d\n",
+				ret);
 			media_entity_cleanup(&sd->entity);
 			goto error;
 		}
@@ -1393,6 +1413,9 @@ void msm_ispif_unregister_entities(struct ispif_device *ispif)
 {
 	int i;
 
+	if (!ispif)
+		return;
+
 	mutex_destroy(&ispif->power_lock);
 	mutex_destroy(&ispif->config_lock);
 
drivers/media/platform/qcom/camss/camss-ispif.h +2 -1
index 4132174f7ea1..fdf28e68cc7d 100644
@@ -63,11 +63,12 @@ struct ispif_device {
 	struct mutex config_lock;
 	unsigned int line_num;
 	struct ispif_line *line;
+	struct camss *camss;
 };
 
 struct resources_ispif;
 
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
 			  const struct resources_ispif *res);
 
 int msm_ispif_register_entities(struct ispif_device *ispif,
drivers/media/platform/qcom/camss/camss.c +65 -34

149 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss.h +1 -1
index 46e986452824..b7ad8e9f68a8 100644
@@ -79,7 +79,7 @@ struct camss {
 	struct csiphy_device *csiphy;
 	int csid_num;
 	struct csid_device *csid;
-	struct ispif_device ispif;
+	struct ispif_device *ispif;
 	int vfe_num;
 	struct vfe_device *vfe;
 	atomic_t ref_count;
Signature · 1 line
2.27.0
Reviewed-by on v5 5/22
#10 lore raw

Re: [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional

Hi Robert,

Quoted 9 lines · Robert Foss

This driver supports multiple architecture versions of the Qualcomm ISP. The CAMSS architecure which this driver is name after, and with the introduction of this series, the Titan architecture.

The ISPIF is an IP-block that is only present in the CAMSS generation of the architecture. In order to support the Titan generation, make the ISPIF an optional subdevice.

Thanks,
Andrey

Quoted 553 lines

---

Changes since v1:
- Björn: Improved commit message
- Björn: Use local 'dev' ptr instead of 'camss->dev'
- Björn: Remove res/ispif NULL checks
- Björn: Remove ispif NULL checks before calling msm_ispif_unregister_entities()
- Andrey: Fixed incorrect allocation size

Changes since v4:
- Andrey: Remove !camss->ispif conditional from camss.c
- Andrey: Fix !camss->ispif in camss-ispif.c
- Move !camss->ispif check to msm_ispif_subdev_init()

  .../media/platform/qcom/camss/camss-ispif.c   | 119 +++++++++++-------
  .../media/platform/qcom/camss/camss-ispif.h   |   3 +-
  drivers/media/platform/qcom/camss/camss.c     |  99 ++++++++++-----
  drivers/media/platform/qcom/camss/camss.h     |   2 +-
  4 files changed, 139 insertions(+), 84 deletions(-)
drivers/media/platform/qcom/camss/camss-ispif.c +71 -48
index adeb92808998..fc121da4ab0c 100644
@@ -161,6 +161,7 @@ static const u32 ispif_formats_8x96[] = {
  static irqreturn_t ispif_isr_8x96(int irq, void *dev)
  {
  	struct ispif_device *ispif = dev;
+	struct camss *camss = ispif->camss;
  	u32 value0, value1, value2, value3, value4, value5;
 
  	value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -186,34 +187,34 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
  		complete(&ispif->reset_complete[1]);
 
  	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
 
  	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
 
  	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
 
  	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
 
  	if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
 
  	if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 pix0 overflow\n");
 
  	if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi0 overflow\n");
 
  	if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 pix1 overflow\n");
 
  	if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi1 overflow\n");
 
  	if (unlikely(value5 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE1 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE1 rdi2 overflow\n");
 
  	return IRQ_HANDLED;
  }
@@ -228,6 +229,7 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
  static irqreturn_t ispif_isr_8x16(int irq, void *dev)
  {
  	struct ispif_device *ispif = dev;
+	struct camss *camss = ispif->camss;
  	u32 value0, value1, value2;
 
  	value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -244,30 +246,32 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)
  		complete(&ispif->reset_complete[0]);
 
  	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
 
  	if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
 
  	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
 
  	if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
 
  	if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
-		dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+		dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
 
  	return IRQ_HANDLED;
  }
 
  static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
  {
+	struct camss *camss = ispif->camss;
+
  	unsigned long time;
  	u32 val;
 
-	if (vfe_id > (to_camss(ispif)->vfe_num - 1)) {
-		dev_err(to_device(ispif),
+	if (vfe_id > (camss->vfe_num - 1)) {
+		dev_err(camss->dev,
  			"Error: asked reset for invalid VFE%d\n", vfe_id);
  		return -ENOENT;
  	}
@@ -300,7 +304,7 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
  	time = wait_for_completion_timeout(&ispif->reset_complete[vfe_id],
  		msecs_to_jiffies(ISPIF_RESET_TIMEOUT_MS));
  	if (!time) {
-		dev_err(to_device(ispif),
+		dev_err(camss->dev,
  			"ISPIF for VFE%d reset timeout\n", vfe_id);
  		return -EIO;
  	}
@@ -316,30 +320,31 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
   */
  static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
  {
+	struct camss *camss = ispif->camss;
  	int ret;
 
-	ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE0);
+	ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
  	if (ret < 0)
  		return ret;
 
-	ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE1);
+	ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
  	if (ret < 0)
  		return ret;
 
  	ret = camss_enable_clocks(ispif->nclocks_for_reset,
  				  ispif->clock_for_reset,
-				  to_device(ispif));
+				  camss->dev);
  	if (ret < 0)
  		return ret;
 
  	ret = ispif_vfe_reset(ispif, vfe_id);
  	if (ret)
-		dev_dbg(to_device(ispif), "ISPIF Reset failed\n");
+		dev_dbg(camss->dev, "ISPIF Reset failed\n");
 
  	camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
 
-	camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE0);
-	camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE1);
+	camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
+	camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
 
  	return ret;
  }
@@ -355,7 +360,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on)
  {
  	struct ispif_line *line = v4l2_get_subdevdata(sd);
  	struct ispif_device *ispif = line->ispif;
-	struct device *dev = to_device(ispif);
+	struct device *dev = ispif->camss->dev;
  	int ret = 0;
 
  	mutex_lock(&ispif->power_lock);
@@ -505,7 +510,7 @@ static int ispif_validate_intf_status(struct ispif_device *ispif,
  	}
 
  	if ((val & 0xf) != 0xf) {
-		dev_err(to_device(ispif), "%s: ispif is busy: 0x%x\n",
+		dev_err(ispif->camss->dev, "%s: ispif is busy: 0x%x\n",
  			__func__, val);
  		ret = -EBUSY;
  	}
@@ -552,7 +557,7 @@ static int ispif_wait_for_stop(struct ispif_device *ispif,
  				 ISPIF_TIMEOUT_SLEEP_US,
  				 ISPIF_TIMEOUT_ALL_US);
  	if (ret < 0)
-		dev_err(to_device(ispif), "%s: ispif stop timeout\n",
+		dev_err(ispif->camss->dev, "%s: ispif stop timeout\n",
  			__func__);
 
  	return ret;
@@ -800,6 +805,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
  {
  	struct ispif_line *line = v4l2_get_subdevdata(sd);
  	struct ispif_device *ispif = line->ispif;
+	struct camss *camss = ispif->camss;
  	enum ispif_intf intf = line->interface;
  	u8 csid = line->csid_id;
  	u8 vfe = line->vfe_id;
@@ -825,8 +831,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
  		ispif_select_csid(ispif, intf, csid, vfe, 1);
  		ispif_select_cid(ispif, intf, cid, vfe, 1);
  		ispif_config_irq(ispif, intf, vfe, 1);
-		if (to_camss(ispif)->version == CAMSS_8x96 ||
-		    to_camss(ispif)->version == CAMSS_660)
+		if (camss->version == CAMSS_8x96 ||
+		    camss->version == CAMSS_660)
  			ispif_config_pack(ispif,
  					  line->fmt[MSM_ISPIF_PAD_SINK].code,
  					  intf, cid, vfe, 1);
@@ -843,8 +849,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
  			return ret;
 
  		mutex_lock(&ispif->config_lock);
-		if (to_camss(ispif)->version == CAMSS_8x96 ||
-		    to_camss(ispif)->version == CAMSS_660)
+		if (camss->version == CAMSS_8x96 ||
+		    camss->version == CAMSS_660)
  			ispif_config_pack(ispif,
  					  line->fmt[MSM_ISPIF_PAD_SINK].code,
  					  intf, cid, vfe, 0);
@@ -1088,26 +1094,32 @@ static int ispif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
   *
   * Return 0 on success or a negative error code otherwise
   */
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
  			  const struct resources_ispif *res)
  {
-	struct device *dev = to_device(ispif);
+	struct device *dev = camss->dev;
+	struct ispif_device *ispif = camss->ispif;
  	struct platform_device *pdev = to_platform_device(dev);
  	struct resource *r;
  	int i;
  	int ret;
 
+	if (!camss->ispif)
+		return 0;
+
+	ispif->camss = camss;
+
  	/* Number of ISPIF lines - same as number of CSID hardware modules */
-	if (to_camss(ispif)->version == CAMSS_8x16)
+	if (camss->version == CAMSS_8x16)
  		ispif->line_num = 2;
-	else if (to_camss(ispif)->version == CAMSS_8x96 ||
-		 to_camss(ispif)->version == CAMSS_660)
+	else if (camss->version == CAMSS_8x96 ||
+		 camss->version == CAMSS_660)
  		ispif->line_num = 4;
  	else
  		return -EINVAL;
 
-	ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),
-				   GFP_KERNEL);
+	ispif->line = devm_kcalloc(dev, ispif->line_num,
+			sizeof(*ispif->line), GFP_KERNEL);
  	if (!ispif->line)
  		return -ENOMEM;
 
@@ -1115,12 +1127,12 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
  		ispif->line[i].ispif = ispif;
  		ispif->line[i].id = i;
 
-		if (to_camss(ispif)->version == CAMSS_8x16) {
+		if (camss->version == CAMSS_8x16) {
  			ispif->line[i].formats = ispif_formats_8x16;
  			ispif->line[i].nformats =
  					ARRAY_SIZE(ispif_formats_8x16);
-		} else if (to_camss(ispif)->version == CAMSS_8x96 ||
-			   to_camss(ispif)->version == CAMSS_660) {
+		} else if (camss->version == CAMSS_8x96 ||
+			   camss->version == CAMSS_660) {
  			ispif->line[i].formats = ispif_formats_8x96;
  			ispif->line[i].nformats =
  					ARRAY_SIZE(ispif_formats_8x96);
@@ -1157,15 +1169,16 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
  	ispif->irq = r->start;
  	snprintf(ispif->irq_name, sizeof(ispif->irq_name), "%s_%s",
  		 dev_name(dev), MSM_ISPIF_NAME);
-	if (to_camss(ispif)->version == CAMSS_8x16)
+	if (camss->version == CAMSS_8x16)
  		ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16,
  			       IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
-	else if (to_camss(ispif)->version == CAMSS_8x96 ||
-		 to_camss(ispif)->version == CAMSS_660)
+	else if (camss->version == CAMSS_8x96 ||
+		 camss->version == CAMSS_660)
  		ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96,
  			       IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
  	else
  		ret = -EINVAL;
+
  	if (ret < 0) {
  		dev_err(dev, "request_irq failed: %d\n", ret);
  		return ret;
@@ -1331,10 +1344,15 @@ static const struct media_entity_operations ispif_media_ops = {
  int msm_ispif_register_entities(struct ispif_device *ispif,
  				struct v4l2_device *v4l2_dev)
  {
-	struct device *dev = to_device(ispif);
+	struct camss *camss;
  	int ret;
  	int i;
 
+	if (!ispif)
+		return 0;
+
+	camss = ispif->camss;
+
  	for (i = 0; i < ispif->line_num; i++) {
  		struct v4l2_subdev *sd = &ispif->line[i].subdev;
  		struct media_pad *pads = ispif->line[i].pads;
@@ -1348,7 +1366,7 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
 
  		ret = ispif_init_formats(sd, NULL);
  		if (ret < 0) {
-			dev_err(dev, "Failed to init format: %d\n", ret);
+			dev_err(camss->dev, "Failed to init format: %d\n", ret);
  			goto error;
  		}
 
@@ -1360,13 +1378,15 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
  		ret = media_entity_pads_init(&sd->entity, MSM_ISPIF_PADS_NUM,
  					     pads);
  		if (ret < 0) {
-			dev_err(dev, "Failed to init media entity: %d\n", ret);
+			dev_err(camss->dev, "Failed to init media entity: %d\n",
+				ret);
  			goto error;
  		}
 
  		ret = v4l2_device_register_subdev(v4l2_dev, sd);
  		if (ret < 0) {
-			dev_err(dev, "Failed to register subdev: %d\n", ret);
+			dev_err(camss->dev, "Failed to register subdev: %d\n",
+				ret);
  			media_entity_cleanup(&sd->entity);
  			goto error;
  		}
@@ -1393,6 +1413,9 @@ void msm_ispif_unregister_entities(struct ispif_device *ispif)
  {
  	int i;
 
+	if (!ispif)
+		return;
+
  	mutex_destroy(&ispif->power_lock);
  	mutex_destroy(&ispif->config_lock);
 
drivers/media/platform/qcom/camss/camss-ispif.h +2 -1
index 4132174f7ea1..fdf28e68cc7d 100644
@@ -63,11 +63,12 @@ struct ispif_device {
  	struct mutex config_lock;
  	unsigned int line_num;
  	struct ispif_line *line;
+	struct camss *camss;
  };
 
  struct resources_ispif;
 
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
  			  const struct resources_ispif *res);
 
  int msm_ispif_register_entities(struct ispif_device *ispif,
drivers/media/platform/qcom/camss/camss.c +65 -34
index 7c0f669f8aa6..5ac2dfc67c8b 100644
@@ -745,10 +745,10 @@ static int camss_init_subdevices(struct camss *camss)
  		}
  	}
 
-	ret = msm_ispif_subdev_init(&camss->ispif, ispif_res);
+	ret = msm_ispif_subdev_init(camss, ispif_res);
  	if (ret < 0) {
  		dev_err(camss->dev, "Failed to init ispif sub-device: %d\n",
-			ret);
+		ret);
  		return ret;
  	}
 
@@ -798,10 +798,11 @@ static int camss_register_entities(struct camss *camss)
  		}
  	}
 
-	ret = msm_ispif_register_entities(&camss->ispif, &camss->v4l2_dev);
+	ret = msm_ispif_register_entities(camss->ispif,
+					  &camss->v4l2_dev);
  	if (ret < 0) {
  		dev_err(camss->dev, "Failed to register ispif entities: %d\n",
-			ret);
+		ret);
  		goto err_reg_ispif;
  	}
 
@@ -835,43 +836,64 @@ static int camss_register_entities(struct camss *camss)
  		}
  	}
 
-	for (i = 0; i < camss->csid_num; i++) {
-		for (j = 0; j < camss->ispif.line_num; j++) {
-			ret = media_create_pad_link(
-				&camss->csid[i].subdev.entity,
-				MSM_CSID_PAD_SRC,
-				&camss->ispif.line[j].subdev.entity,
-				MSM_ISPIF_PAD_SINK,
-				0);
-			if (ret < 0) {
-				dev_err(camss->dev,
-					"Failed to link %s->%s entities: %d\n",
-					camss->csid[i].subdev.entity.name,
-					camss->ispif.line[j].subdev.entity.name,
-					ret);
-				goto err_link;
-			}
-		}
-	}
-
-	for (i = 0; i < camss->ispif.line_num; i++)
-		for (k = 0; k < camss->vfe_num; k++)
-			for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+	if (camss->ispif) {
+		for (i = 0; i < camss->csid_num; i++) {
+			for (j = 0; j < camss->ispif->line_num; j++) {
  				ret = media_create_pad_link(
-					&camss->ispif.line[i].subdev.entity,
-					MSM_ISPIF_PAD_SRC,
-					&camss->vfe[k].line[j].subdev.entity,
-					MSM_VFE_PAD_SINK,
+					&camss->csid[i].subdev.entity,
+					MSM_CSID_PAD_SRC,
+					&camss->ispif->line[j].subdev.entity,
+					MSM_ISPIF_PAD_SINK,
  					0);
  				if (ret < 0) {
  					dev_err(camss->dev,
  						"Failed to link %s->%s entities: %d\n",
-						camss->ispif.line[i].subdev.entity.name,
-						camss->vfe[k].line[j].subdev.entity.name,
+						camss->csid[i].subdev.entity.name,
+						camss->ispif->line[j].subdev.entity.name,
  						ret);
  					goto err_link;
  				}
  			}
+		}
+
+		for (i = 0; i < camss->ispif->line_num; i++)
+			for (k = 0; k < camss->vfe_num; k++)
+				for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+					ret = media_create_pad_link(
+						&camss->ispif->line[i].subdev.entity,
+						MSM_ISPIF_PAD_SRC,
+						&camss->vfe[k].line[j].subdev.entity,
+						MSM_VFE_PAD_SINK,
+						0);
+					if (ret < 0) {
+						dev_err(camss->dev,
+							"Failed to link %s->%s entities: %d\n",
+							camss->ispif->line[i].subdev.entity.name,
+							camss->vfe[k].line[j].subdev.entity.name,
+							ret);
+						goto err_link;
+					}
+				}
+	} else {
+		for (i = 0; i < camss->csid_num; i++)
+			for (k = 0; k < camss->vfe_num; k++)
+				for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+					ret = media_create_pad_link(
+						&camss->csid[i].subdev.entity,
+						MSM_CSID_PAD_SRC,
+						&camss->vfe[k].line[j].subdev.entity,
+						MSM_VFE_PAD_SINK,
+						0);
+					if (ret < 0) {
+						dev_err(camss->dev,
+							"Failed to link %s->%s entities: %d\n",
+							camss->csid[i].subdev.entity.name,
+							camss->vfe[k].line[j].subdev.entity.name,
+							ret);
+						goto err_link;
+					}
+				}
+	}
 
  	return 0;
 
@@ -881,8 +903,8 @@ static int camss_register_entities(struct camss *camss)
  	for (i--; i >= 0; i--)
  		msm_vfe_unregister_entities(&camss->vfe[i]);
 
-	msm_ispif_unregister_entities(&camss->ispif);
  err_reg_ispif:
+	msm_ispif_unregister_entities(camss->ispif);
 
  	i = camss->csid_num;
  err_reg_csid:
@@ -913,7 +935,7 @@ static void camss_unregister_entities(struct camss *camss)
  	for (i = 0; i < camss->csid_num; i++)
  		msm_csid_unregister_entity(&camss->csid[i]);
 
-	msm_ispif_unregister_entities(&camss->ispif);
+	msm_ispif_unregister_entities(camss->ispif);
 
  	for (i = 0; i < camss->vfe_num; i++)
  		msm_vfe_unregister_entities(&camss->vfe[i]);
@@ -1044,6 +1066,15 @@ static int camss_probe(struct platform_device *pdev)
  		goto err_free;
  	}
 
+	if (camss->version == CAMSS_8x16 ||
+	    camss->version == CAMSS_8x96) {
+		camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL);
+		if (!camss->ispif) {
+			ret = -ENOMEM;
+			goto err_free;
+		}
+	}
+
  	camss->vfe = devm_kcalloc(dev, camss->vfe_num, sizeof(*camss->vfe),
  				  GFP_KERNEL);
  	if (!camss->vfe) {
drivers/media/platform/qcom/camss/camss.h +1 -1
index 46e986452824..b7ad8e9f68a8 100644
@@ -79,7 +79,7 @@ struct camss {
  	struct csiphy_device *csiphy;
  	int csid_num;
  	struct csid_device *csid;
-	struct ispif_device ispif;
+	struct ispif_device *ispif;
  	int vfe_num;
  	struct vfe_device *vfe;
  	atomic_t ref_count;
#11 lore raw

PATCH v5 6/22 media: camss: Refactor VFE HW version support

In reply to Robert Foss

In order to support Qualcomm ISP hardware architectures that diverge from older architectures, the VFE subdevice driver needs to be refactored to better abstract the different ISP architectures.

Gen1 represents the CAMSS ISP architecture. The ISP architecture developed after CAMSS, Titan, will be referred to as Gen2.

---

Changes since v1
- kernel test robot: Re-add chunk missing from vfe_output_update_pong_addr
- Andrey: Fix file name error
- Andrey: Change hardware version number in comment
- Changed copyright year to 2021 for camss-vfe-4-8.c

Changes since v3:
- Nicolas: Replace trace_printk() with dev_dbg()
- Removed spurious whitespace

Changes since v4:
- Andrey: Refactor to make PIX support optional

 drivers/media/platform/qcom/camss/Makefile    |    2 +
 .../media/platform/qcom/camss/camss-vfe-4-1.c |  118 +-
 .../media/platform/qcom/camss/camss-vfe-4-7.c |  239 ++--
 .../media/platform/qcom/camss/camss-vfe-4-8.c | 1166 +++++++++++++++++
 .../platform/qcom/camss/camss-vfe-gen1.c      |  763 +++++++++++
 .../platform/qcom/camss/camss-vfe-gen1.h      |  110 ++
 drivers/media/platform/qcom/camss/camss-vfe.c |  790 +----------
 drivers/media/platform/qcom/camss/camss-vfe.h |  121 +-
 drivers/media/platform/qcom/camss/camss.c     |    4 +-
 9 files changed, 2263 insertions(+), 1050 deletions(-)
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h
drivers/media/platform/qcom/camss/Makefile +2 -0
index 63c1b1b2943c..940c0ae3e003 100644
@@ -10,6 +10,8 @@ qcom-camss-objs += \
 		camss-ispif.o \
 		camss-vfe-4-1.o \
 		camss-vfe-4-7.o \
+		camss-vfe-4-8.o \
+		camss-vfe-gen1.o \
 		camss-vfe.o \
 		camss-video.o \
 
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +49 -69

151 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe-4-7.c +77 -162

333 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +1166 -0

1,166 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +763 -0

763 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe-gen1.h new file +110 -0

110 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe.c +26 -764

469 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe.h +68 -53

121 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss.c +2 -2
index 5ac2dfc67c8b..6c6f1e59ccd8 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.27.0

Part of the diff is not shown here. View the raw message.

Reviewed-by on v5 6/22
#12 lore raw

Re: [PATCH v5 06/22] media: camss: Refactor VFE HW version support

Hi Robert,

Thank you for your patch!

Just two minor comments below.

Quoted 1,561 lines · Robert Foss

In order to support Qualcomm ISP hardware architectures that diverge from older architectures, the VFE subdevice driver needs to be refactored to better abstract the different ISP architectures.

Gen1 represents the CAMSS ISP architecture. The ISP architecture developed after CAMSS, Titan, will be referred to as Gen2.

---

Changes since v1
- kernel test robot: Re-add chunk missing from vfe_output_update_pong_addr
- Andrey: Fix file name error
- Andrey: Change hardware version number in comment
- Changed copyright year to 2021 for camss-vfe-4-8.c

Changes since v3:
- Nicolas: Replace trace_printk() with dev_dbg()
- Removed spurious whitespace

Changes since v4:
- Andrey: Refactor to make PIX support optional

  drivers/media/platform/qcom/camss/Makefile    |    2 +
  .../media/platform/qcom/camss/camss-vfe-4-1.c |  118 +-
  .../media/platform/qcom/camss/camss-vfe-4-7.c |  239 ++--
  .../media/platform/qcom/camss/camss-vfe-4-8.c | 1166 +++++++++++++++++
  .../platform/qcom/camss/camss-vfe-gen1.c      |  763 +++++++++++
  .../platform/qcom/camss/camss-vfe-gen1.h      |  110 ++
  drivers/media/platform/qcom/camss/camss-vfe.c |  790 +----------
  drivers/media/platform/qcom/camss/camss-vfe.h |  121 +-
  drivers/media/platform/qcom/camss/camss.c     |    4 +-
  9 files changed, 2263 insertions(+), 1050 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h

drivers/media/platform/qcom/camss/Makefile +2 -0
index 63c1b1b2943c..940c0ae3e003 100644
@@ -10,6 +10,8 @@ qcom-camss-objs += \
  		camss-ispif.o \
  		camss-vfe-4-1.o \
  		camss-vfe-4-7.o \
+		camss-vfe-4-8.o \
+		camss-vfe-gen1.o \
  		camss-vfe.o \
  		camss-video.o \
 
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +49 -69
index 85b9bcbc7321..81756d7fd5c2 100644
@@ -14,6 +14,7 @@
 
  #include "camss.h"
  #include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
 
  #define VFE_0_HW_VERSION		0x000
 
@@ -284,30 +285,6 @@ static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
  			1 << VFE_0_BUS_IMAGE_MASTER_n_WR_CFG_FRM_BASED_SHIFT);
  }
 
-#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
-
-static int vfe_word_per_line(u32 format, u32 pixel_per_line)
-{
-	int val = 0;
-
-	switch (format) {
-	case V4L2_PIX_FMT_NV12:
-	case V4L2_PIX_FMT_NV21:
-	case V4L2_PIX_FMT_NV16:
-	case V4L2_PIX_FMT_NV61:
-		val = CALC_WORD(pixel_per_line, 1, 8);
-		break;
-	case V4L2_PIX_FMT_YUYV:
-	case V4L2_PIX_FMT_YVYU:
-	case V4L2_PIX_FMT_UYVY:
-	case V4L2_PIX_FMT_VYUY:
-		val = CALC_WORD(pixel_per_line, 2, 8);
-		break;
-	}
-
-	return val;
-}
-
  static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
  			     u16 *width, u16 *height, u16 *bytesperline)
  {
@@ -666,20 +643,6 @@ static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
  	writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
  }
 
-static inline u8 vfe_calc_interp_reso(u16 input, u16 output)
-{
-	if (input / output >= 16)
-		return 0;
-
-	if (input / output >= 8)
-		return 1;
-
-	if (input / output >= 4)
-		return 2;
-
-	return 3;
-}
-
  static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
  {
  	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
@@ -975,46 +938,63 @@ static irqreturn_t vfe_isr(int irq, void *dev)
  	return IRQ_HANDLED;
  }
 
-const struct vfe_hw_ops vfe_ops_4_1 = {
-	.hw_version_read = vfe_hw_version_read,
+
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_1 = {
+	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+	.bus_enable_wr_if = vfe_bus_enable_wr_if,
+	.bus_reload_wm = vfe_bus_reload_wm,
+	.camif_wait_for_stop = vfe_camif_wait_for_stop,
+	.enable_irq_common = vfe_enable_irq_common,
+	.enable_irq_pix_line = vfe_enable_irq_pix_line,
+	.enable_irq_wm_line = vfe_enable_irq_wm_line,
  	.get_ub_size = vfe_get_ub_size,
-	.global_reset = vfe_global_reset,
-	.halt_request = vfe_halt_request,
  	.halt_clear = vfe_halt_clear,
+	.halt_request = vfe_halt_request,
+	.set_camif_cfg = vfe_set_camif_cfg,
+	.set_camif_cmd = vfe_set_camif_cmd,
+	.set_cgc_override = vfe_set_cgc_override,
+	.set_clamp_cfg = vfe_set_clamp_cfg,
+	.set_crop_cfg = vfe_set_crop_cfg,
+	.set_demux_cfg = vfe_set_demux_cfg,
+	.set_ds = vfe_set_ds,
+	.set_module_cfg = vfe_set_module_cfg,
+	.set_qos = vfe_set_qos,
+	.set_rdi_cid = vfe_set_rdi_cid,
+	.set_realign_cfg = vfe_set_realign_cfg,
+	.set_scale_cfg = vfe_set_scale_cfg,
+	.set_xbar_cfg = vfe_set_xbar_cfg,
  	.wm_enable = vfe_wm_enable,
  	.wm_frame_based = vfe_wm_frame_based,
+	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
  	.wm_line_based = vfe_wm_line_based,
-	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
  	.wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-	.bus_reload_wm = vfe_bus_reload_wm,
+	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
  	.wm_set_ping_addr = vfe_wm_set_ping_addr,
  	.wm_set_pong_addr = vfe_wm_set_pong_addr,
-	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-	.bus_enable_wr_if = vfe_bus_enable_wr_if,
-	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
  	.wm_set_subsample = vfe_wm_set_subsample,
-	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-	.set_xbar_cfg = vfe_set_xbar_cfg,
-	.set_realign_cfg = vfe_set_realign_cfg,
-	.set_rdi_cid = vfe_set_rdi_cid,
-	.reg_update = vfe_reg_update,
-	.reg_update_clear = vfe_reg_update_clear,
-	.enable_irq_wm_line = vfe_enable_irq_wm_line,
-	.enable_irq_pix_line = vfe_enable_irq_pix_line,
-	.enable_irq_common = vfe_enable_irq_common,
-	.set_demux_cfg = vfe_set_demux_cfg,
-	.set_scale_cfg = vfe_set_scale_cfg,
-	.set_crop_cfg = vfe_set_crop_cfg,
-	.set_clamp_cfg = vfe_set_clamp_cfg,
-	.set_qos = vfe_set_qos,
-	.set_ds = vfe_set_ds,
-	.set_cgc_override = vfe_set_cgc_override,
-	.set_camif_cfg = vfe_set_camif_cfg,
-	.set_camif_cmd = vfe_set_camif_cmd,
-	.set_module_cfg = vfe_set_module_cfg,
-	.camif_wait_for_stop = vfe_camif_wait_for_stop,
+	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+	vfe->isr_ops = vfe_isr_ops_gen1;
+	vfe->ops_gen1 = &vfe_ops_gen1_4_1;
+	vfe->video_ops = vfe_video_ops_gen1;
+
+	vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_1 = {
+	.global_reset = vfe_global_reset,
+	.hw_version_read = vfe_hw_version_read,
  	.isr_read = vfe_isr_read,
-	.violation_read = vfe_violation_read,
  	.isr = vfe_isr,
+	.reg_update_clear = vfe_reg_update_clear,
+	.reg_update = vfe_reg_update,
+	.subdev_init = vfe_subdev_init,
+	.vfe_disable = vfe_gen1_disable,
+	.vfe_enable = vfe_gen1_enable,
+	.vfe_halt = vfe_gen1_halt,
+	.violation_read = vfe_violation_read,
  };
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +77 -162
index f7e00a2de393..a3f31f38dfed 100644
@@ -14,6 +14,8 @@
 
  #include "camss.h"
  #include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
 
  #define VFE_0_HW_VERSION		0x000
 
@@ -258,7 +260,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
  	dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version);
  }
 
-static u16 vfe47_get_ub_size(u8 vfe_id)
+static u16 vfe_get_ub_size(u8 vfe_id)
  {
  	if (vfe_id == 0)
  		return MSM_VFE_VFE0_UB_SIZE_RDI;
@@ -296,6 +298,8 @@ static void vfe_global_reset(struct vfe_device *vfe)
  			 VFE_0_GLOBAL_RESET_CMD_CORE;
 
  	writel_relaxed(BIT(31), vfe->base + VFE_0_IRQ_MASK_0);
+
+	/* Enforce barrier between IRQ mask setup and global reset */
  	wmb();
  	writel_relaxed(reset_bits, vfe->base + VFE_0_GLOBAL_RESET_CMD);
  }
@@ -311,7 +315,7 @@ static void vfe_halt_clear(struct vfe_device *vfe)
  	writel_relaxed(0x0, vfe->base + VFE_0_BUS_BDG_CMD);
  }
 
-static void vfe47_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
+static void vfe_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
  {
  	if (enable)
  		vfe_reg_set(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_CFG(wm),
@@ -460,8 +464,12 @@ static void vfe_wm_set_ub_cfg(struct vfe_device *vfe, u8 wm,
 
  static void vfe_bus_reload_wm(struct vfe_device *vfe, u8 wm)
  {
+	/* Enforce barrier between any outstanding register write */
  	wmb();
+
  	writel_relaxed(VFE_0_BUS_CMD_Mx_RLD_CMD(wm), vfe->base + VFE_0_BUS_CMD);
+
+	/* Use barrier to make sure bus reload is issued before anything else */
  	wmb();
  }
 
@@ -675,8 +683,12 @@ static void vfe_set_rdi_cid(struct vfe_device *vfe, enum vfe_line_id id, u8 cid)
  static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
  {
  	vfe->reg_update |= VFE_0_REG_UPDATE_line_n(line_id);
+
+	/* Enforce barrier between line update and commit */
  	wmb();
  	writel_relaxed(vfe->reg_update, vfe->base + VFE_0_REG_UPDATE);
+
+	/* Make sure register update is issued before further reg writes */
  	wmb();
  }
 
@@ -780,20 +792,6 @@ static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
  	writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
  }
 
-static inline u8 vfe_calc_interp_reso(u16 input, u16 output)
-{
-	if (input / output >= 16)
-		return 0;
-
-	if (input / output >= 8)
-		return 1;
-
-	if (input / output >= 4)
-		return 2;
-
-	return 3;
-}
-
  static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
  {
  	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
@@ -895,7 +893,7 @@ static void vfe_set_clamp_cfg(struct vfe_device *vfe)
  	writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MIN_CFG);
  }
 
-static void vfe47_set_qos(struct vfe_device *vfe)
+static void vfe_set_qos(struct vfe_device *vfe)
  {
  	u32 val = VFE_0_BUS_BDG_QOS_CFG_0_CFG;
  	u32 val7 = VFE_0_BUS_BDG_QOS_CFG_7_CFG;
@@ -910,7 +908,7 @@ static void vfe47_set_qos(struct vfe_device *vfe)
  	writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
  }
 
-static void vfe47_set_ds(struct vfe_device *vfe)
+static void vfe_set_ds(struct vfe_device *vfe)
  {
  	u32 val = VFE_0_BUS_BDG_DS_CFG_0_CFG;
  	u32 val16 = VFE_0_BUS_BDG_DS_CFG_16_CFG;
@@ -994,6 +992,8 @@ static void vfe_set_camif_cmd(struct vfe_device *vfe, u8 enable)
 
  	cmd = VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS | VFE_0_CAMIF_CMD_NO_CHANGE;
  	writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+
+	/* Make sure camif command is issued written before it is changed again */
  	wmb();
 
  	if (enable)
@@ -1036,24 +1036,7 @@ static int vfe_camif_wait_for_stop(struct vfe_device *vfe, struct device *dev)
  	return ret;
  }
 
-static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
-{
-	*value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
-	*value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
 
-	writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
-	writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
-
-	wmb();
-	writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
-}
-
-static void vfe_violation_read(struct vfe_device *vfe)
-{
-	u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
-
-	pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
-}
 
  /*
   * vfe_isr - VFE module interrupt handler
@@ -1108,150 +1091,82 @@ static irqreturn_t vfe_isr(int irq, void *dev)
  	return IRQ_HANDLED;
  }
 
-const struct vfe_hw_ops vfe_ops_4_7 = {
-	.hw_version_read = vfe_hw_version_read,
-	.get_ub_size = vfe47_get_ub_size,
-	.global_reset = vfe_global_reset,
-	.halt_request = vfe_halt_request,
-	.halt_clear = vfe_halt_clear,
-	.wm_enable = vfe47_wm_enable,
-	.wm_frame_based = vfe_wm_frame_based,
-	.wm_line_based = vfe_wm_line_based,
-	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
-	.wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-	.bus_reload_wm = vfe_bus_reload_wm,
-	.wm_set_ping_addr = vfe_wm_set_ping_addr,
-	.wm_set_pong_addr = vfe_wm_set_pong_addr,
-	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-	.bus_enable_wr_if = vfe_bus_enable_wr_if,
-	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
-	.wm_set_subsample = vfe_wm_set_subsample,
-	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-	.set_xbar_cfg = vfe_set_xbar_cfg,
-	.set_realign_cfg = vfe_set_realign_cfg,
-	.set_rdi_cid = vfe_set_rdi_cid,
-	.reg_update = vfe_reg_update,
-	.reg_update_clear = vfe_reg_update_clear,
-	.enable_irq_wm_line = vfe_enable_irq_wm_line,
-	.enable_irq_pix_line = vfe_enable_irq_pix_line,
-	.enable_irq_common = vfe_enable_irq_common,
-	.set_demux_cfg = vfe_set_demux_cfg,
-	.set_scale_cfg = vfe_set_scale_cfg,
-	.set_crop_cfg = vfe_set_crop_cfg,
-	.set_clamp_cfg = vfe_set_clamp_cfg,
-	.set_qos = vfe47_set_qos,
-	.set_ds = vfe47_set_ds,
-	.set_cgc_override = vfe_set_cgc_override,
-	.set_camif_cfg = vfe_set_camif_cfg,
-	.set_camif_cmd = vfe_set_camif_cmd,
-	.set_module_cfg = vfe_set_module_cfg,
-	.camif_wait_for_stop = vfe_camif_wait_for_stop,
-	.isr_read = vfe_isr_read,
-	.violation_read = vfe_violation_read,
-	.isr = vfe_isr,
-};
-
-static u16 vfe48_get_ub_size(u8 vfe_id)
+static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
  {
-	/* On VFE4.8 the ub-size is the same on both instances */
-	return MSM_VFE_VFE0_UB_SIZE_RDI;
-}
+	*value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
+	*value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
 
-static void vfe48_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
-{
-	if (enable)
-		writel_relaxed(2 << VFE48_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
-			       vfe->base + VFE48_0_BUS_IMAGE_MASTER_CMD);
-	else
-		writel_relaxed(1 << VFE48_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
-			       vfe->base + VFE48_0_BUS_IMAGE_MASTER_CMD);
+	writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
+	writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
 
-	/* The WM must be enabled before sending other commands */
+	/* Enforce barrier between local & global IRQ clear */
  	wmb();
+	writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
  }
 
-static void vfe48_set_qos(struct vfe_device *vfe)
-{
-	u32 val = VFE48_0_BUS_BDG_QOS_CFG_0_CFG;
-	u32 val3 = VFE48_0_BUS_BDG_QOS_CFG_3_CFG;
-	u32 val4 = VFE48_0_BUS_BDG_QOS_CFG_4_CFG;
-	u32 val7 = VFE48_0_BUS_BDG_QOS_CFG_7_CFG;
-
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_0);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_1);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_2);
-	writel_relaxed(val3, vfe->base + VFE_0_BUS_BDG_QOS_CFG_3);
-	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_4);
-	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
-	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
-	writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
-}
-
-static void vfe48_set_ds(struct vfe_device *vfe)
+static void vfe_violation_read(struct vfe_device *vfe)
  {
-	u32 val = VFE48_0_BUS_BDG_DS_CFG_0_CFG;
-	u32 val16 = VFE48_0_BUS_BDG_DS_CFG_16_CFG;
+	u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
 
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_0);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_1);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_2);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_3);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_4);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_5);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_6);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_7);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_8);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_9);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_10);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_11);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_12);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_13);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_14);
-	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_15);
-	writel_relaxed(val16, vfe->base + VFE_0_BUS_BDG_DS_CFG_16);
+	pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
  }
 
-const struct vfe_hw_ops vfe_ops_4_8 = {
-	.hw_version_read = vfe_hw_version_read,
-	.get_ub_size = vfe48_get_ub_size,
-	.global_reset = vfe_global_reset,
-	.halt_request = vfe_halt_request,
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_7 = {
+	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+	.bus_enable_wr_if = vfe_bus_enable_wr_if,
+	.bus_reload_wm = vfe_bus_reload_wm,
+	.camif_wait_for_stop = vfe_camif_wait_for_stop,
+	.enable_irq_common = vfe_enable_irq_common,
+	.enable_irq_pix_line = vfe_enable_irq_pix_line,
+	.enable_irq_wm_line = vfe_enable_irq_wm_line,
+	.get_ub_size = vfe_get_ub_size,
  	.halt_clear = vfe_halt_clear,
-	.wm_enable = vfe48_wm_enable,
+	.halt_request = vfe_halt_request,
+	.set_camif_cfg = vfe_set_camif_cfg,
+	.set_camif_cmd = vfe_set_camif_cmd,
+	.set_cgc_override = vfe_set_cgc_override,
+	.set_clamp_cfg = vfe_set_clamp_cfg,
+	.set_crop_cfg = vfe_set_crop_cfg,
+	.set_demux_cfg = vfe_set_demux_cfg,
+	.set_ds = vfe_set_ds,
+	.set_module_cfg = vfe_set_module_cfg,
+	.set_qos = vfe_set_qos,
+	.set_rdi_cid = vfe_set_rdi_cid,
+	.set_realign_cfg = vfe_set_realign_cfg,
+	.set_scale_cfg = vfe_set_scale_cfg,
+	.set_xbar_cfg = vfe_set_xbar_cfg,
+	.wm_enable = vfe_wm_enable,
  	.wm_frame_based = vfe_wm_frame_based,
+	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
  	.wm_line_based = vfe_wm_line_based,
-	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
  	.wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-	.bus_reload_wm = vfe_bus_reload_wm,
+	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
  	.wm_set_ping_addr = vfe_wm_set_ping_addr,
  	.wm_set_pong_addr = vfe_wm_set_pong_addr,
-	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-	.bus_enable_wr_if = vfe_bus_enable_wr_if,
-	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
  	.wm_set_subsample = vfe_wm_set_subsample,
-	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-	.set_xbar_cfg = vfe_set_xbar_cfg,
-	.set_realign_cfg = vfe_set_realign_cfg,
-	.set_rdi_cid = vfe_set_rdi_cid,
-	.reg_update = vfe_reg_update,
-	.reg_update_clear = vfe_reg_update_clear,
-	.enable_irq_wm_line = vfe_enable_irq_wm_line,
-	.enable_irq_pix_line = vfe_enable_irq_pix_line,
-	.enable_irq_common = vfe_enable_irq_common,
-	.set_demux_cfg = vfe_set_demux_cfg,
-	.set_scale_cfg = vfe_set_scale_cfg,
-	.set_crop_cfg = vfe_set_crop_cfg,
-	.set_clamp_cfg = vfe_set_clamp_cfg,
-	.set_qos = vfe48_set_qos,
-	.set_ds = vfe48_set_ds,
-	.set_cgc_override = vfe_set_cgc_override,
-	.set_camif_cfg = vfe_set_camif_cfg,
-	.set_camif_cmd = vfe_set_camif_cmd,
-	.set_module_cfg = vfe_set_module_cfg,
-	.camif_wait_for_stop = vfe_camif_wait_for_stop,
+	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+	vfe->isr_ops = vfe_isr_ops_gen1;
+	vfe->ops_gen1 = &vfe_ops_gen1_4_7;
+	vfe->video_ops = vfe_video_ops_gen1;
+
+	vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_7 = {
+	.global_reset = vfe_global_reset,
+	.hw_version_read = vfe_hw_version_read,
  	.isr_read = vfe_isr_read,
-	.violation_read = vfe_violation_read,
  	.isr = vfe_isr,
+	.reg_update_clear = vfe_reg_update_clear,
+	.reg_update = vfe_reg_update,
+	.subdev_init = vfe_subdev_init,
+	.vfe_disable = vfe_gen1_disable,
+	.vfe_enable = vfe_gen1_enable,
+	.vfe_halt = vfe_gen1_halt,
+	.violation_read = vfe_violation_read,
  };
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +994 -0
new file mode 100644
index 000000000000..241f763f8386
@@ -0,0 +1,1166 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-4-8.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.8
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2021 Linaro Ltd.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
+
+#define VFE_0_HW_VERSION		0x000
+
+#define VFE_0_GLOBAL_RESET_CMD		0x018
+#define VFE_0_GLOBAL_RESET_CMD_CORE	BIT(0)
+#define VFE_0_GLOBAL_RESET_CMD_CAMIF	BIT(1)
+#define VFE_0_GLOBAL_RESET_CMD_BUS	BIT(2)
+#define VFE_0_GLOBAL_RESET_CMD_BUS_BDG	BIT(3)
+#define VFE_0_GLOBAL_RESET_CMD_REGISTER	BIT(4)
+#define VFE_0_GLOBAL_RESET_CMD_PM	BIT(5)
+#define VFE_0_GLOBAL_RESET_CMD_BUS_MISR	BIT(6)
+#define VFE_0_GLOBAL_RESET_CMD_TESTGEN	BIT(7)
+#define VFE_0_GLOBAL_RESET_CMD_DSP	BIT(8)
+#define VFE_0_GLOBAL_RESET_CMD_IDLE_CGC	BIT(9)
+
+#define VFE_0_MODULE_LENS_EN		0x040
+#define VFE_0_MODULE_LENS_EN_DEMUX		BIT(2)
+#define VFE_0_MODULE_LENS_EN_CHROMA_UPSAMPLE	BIT(3)
+
+#define VFE_0_MODULE_ZOOM_EN		0x04c
+#define VFE_0_MODULE_ZOOM_EN_SCALE_ENC		BIT(1)
+#define VFE_0_MODULE_ZOOM_EN_CROP_ENC		BIT(2)
+#define VFE_0_MODULE_ZOOM_EN_REALIGN_BUF	BIT(9)
+
+#define VFE_0_CORE_CFG			0x050
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_YCBYCR	0x4
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_YCRYCB	0x5
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_CBYCRY	0x6
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_CRYCBY	0x7
+#define VFE_0_CORE_CFG_COMPOSITE_REG_UPDATE_EN	BIT(4)
+
+#define VFE_0_IRQ_CMD			0x058
+#define VFE_0_IRQ_CMD_GLOBAL_CLEAR	BIT(0)
+
+#define VFE_0_IRQ_MASK_0		0x05c
+#define VFE_0_IRQ_MASK_0_CAMIF_SOF			BIT(0)
+#define VFE_0_IRQ_MASK_0_CAMIF_EOF			BIT(1)
+#define VFE_0_IRQ_MASK_0_RDIn_REG_UPDATE(n)		BIT((n) + 5)
+#define VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(n)		\
+	((n) == VFE_LINE_PIX ? BIT(4) : VFE_0_IRQ_MASK_0_RDIn_REG_UPDATE(n))
+#define VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(n)	BIT((n) + 8)
+#define VFE_0_IRQ_MASK_0_IMAGE_COMPOSITE_DONE_n(n)	BIT((n) + 25)
+#define VFE_0_IRQ_MASK_0_RESET_ACK			BIT(31)
+#define VFE_0_IRQ_MASK_1		0x060
+#define VFE_0_IRQ_MASK_1_CAMIF_ERROR			BIT(0)
+#define VFE_0_IRQ_MASK_1_VIOLATION			BIT(7)
+#define VFE_0_IRQ_MASK_1_BUS_BDG_HALT_ACK		BIT(8)
+#define VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)	BIT((n) + 9)
+#define VFE_0_IRQ_MASK_1_RDIn_SOF(n)			BIT((n) + 29)
+
+#define VFE_0_IRQ_CLEAR_0		0x064
+#define VFE_0_IRQ_CLEAR_1		0x068
+
+#define VFE_0_IRQ_STATUS_0		0x06c
+#define VFE_0_IRQ_STATUS_0_CAMIF_SOF			BIT(0)
+#define VFE_0_IRQ_STATUS_0_RDIn_REG_UPDATE(n)		BIT((n) + 5)
+#define VFE_0_IRQ_STATUS_0_line_n_REG_UPDATE(n)		\
+	((n) == VFE_LINE_PIX ? BIT(4) : VFE_0_IRQ_STATUS_0_RDIn_REG_UPDATE(n))
+#define VFE_0_IRQ_STATUS_0_IMAGE_MASTER_n_PING_PONG(n)	BIT((n) + 8)
+#define VFE_0_IRQ_STATUS_0_IMAGE_COMPOSITE_DONE_n(n)	BIT((n) + 25)
+#define VFE_0_IRQ_STATUS_0_RESET_ACK			BIT(31)
+#define VFE_0_IRQ_STATUS_1		0x070
+#define VFE_0_IRQ_STATUS_1_VIOLATION			BIT(7)
+#define VFE_0_IRQ_STATUS_1_BUS_BDG_HALT_ACK		BIT(8)
+#define VFE_0_IRQ_STATUS_1_RDIn_SOF(n)			BIT((n) + 29)
+
+#define VFE_0_IRQ_COMPOSITE_MASK_0	0x074
+#define VFE_0_VIOLATION_STATUS		0x07c
+
+#define VFE_0_BUS_CMD			0x80
+#define VFE_0_BUS_CMD_Mx_RLD_CMD(x)	BIT(x)
+
+#define VFE_0_BUS_CFG			0x084
+
+#define VFE_0_BUS_XBAR_CFG_x(x)		(0x90 + 0x4 * ((x) / 2))
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN			BIT(2)
+#define VFE_0_BUS_XBAR_CFG_x_M_REALIGN_BUF_EN			BIT(3)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTRA		(0x1 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER		(0x2 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA	(0x3 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT		8
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_LUMA		0x0
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0	0xc
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1	0xd
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2	0xe
+
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_CFG(n)		(0x0a0 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_CFG_WR_PATH_SHIFT	0
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_PING_ADDR(n)	(0x0a4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_PONG_ADDR(n)	(0x0ac + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(n)		(0x0b4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT	1
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_SHIFT	2
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK	(0x1f << 2)
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG(n)		(0x0b8 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG_OFFSET_SHIFT	16
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(n)	(0x0bc + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(n)	(0x0c0 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_FRAMEDROP_PATTERN(n)	\
+							(0x0c4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN(n)	\
+							(0x0c8 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN_DEF	0xffffffff
+
+#define VFE_0_BUS_PING_PONG_STATUS	0x338
+
+#define VFE_0_BUS_BDG_CMD		0x400
+#define VFE_0_BUS_BDG_CMD_HALT_REQ	1
+
+#define VFE_0_BUS_BDG_QOS_CFG_0		0x404
+#define VFE_0_BUS_BDG_QOS_CFG_0_CFG	0xaaa5aaa5
+#define VFE_0_BUS_BDG_QOS_CFG_1		0x408
+#define VFE_0_BUS_BDG_QOS_CFG_2		0x40c
+#define VFE_0_BUS_BDG_QOS_CFG_3		0x410
+#define VFE_0_BUS_BDG_QOS_CFG_3_CFG	0xaa55aaa5
+#define VFE_0_BUS_BDG_QOS_CFG_4		0x414
+#define VFE_0_BUS_BDG_QOS_CFG_4_CFG	0xaa55aa55
+#define VFE_0_BUS_BDG_QOS_CFG_5		0x418
+#define VFE_0_BUS_BDG_QOS_CFG_6		0x41c
+#define VFE_0_BUS_BDG_QOS_CFG_7		0x420
+#define VFE_0_BUS_BDG_QOS_CFG_7_CFG	0x0005aa55
+
+#define VFE_0_BUS_BDG_DS_CFG_0		0x424
+#define VFE_0_BUS_BDG_DS_CFG_0_CFG	0xcccc1111
+#define VFE_0_BUS_BDG_DS_CFG_1		0x428
+#define VFE_0_BUS_BDG_DS_CFG_2		0x42c
+#define VFE_0_BUS_BDG_DS_CFG_3		0x430
+#define VFE_0_BUS_BDG_DS_CFG_4		0x434
+#define VFE_0_BUS_BDG_DS_CFG_5		0x438
+#define VFE_0_BUS_BDG_DS_CFG_6		0x43c
+#define VFE_0_BUS_BDG_DS_CFG_7		0x440
+#define VFE_0_BUS_BDG_DS_CFG_8		0x444
+#define VFE_0_BUS_BDG_DS_CFG_9		0x448
+#define VFE_0_BUS_BDG_DS_CFG_10		0x44c
+#define VFE_0_BUS_BDG_DS_CFG_11		0x450
+#define VFE_0_BUS_BDG_DS_CFG_12		0x454
+#define VFE_0_BUS_BDG_DS_CFG_13		0x458
+#define VFE_0_BUS_BDG_DS_CFG_14		0x45c
+#define VFE_0_BUS_BDG_DS_CFG_15		0x460
+#define VFE_0_BUS_BDG_DS_CFG_16		0x464
+#define VFE_0_BUS_BDG_DS_CFG_16_CFG	0x00000110
+
+#define VFE_0_RDI_CFG_x(x)		(0x46c + (0x4 * (x)))
+#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_SHIFT	28
+#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_MASK	(0xf << 28)
+#define VFE_0_RDI_CFG_x_RDI_M0_SEL_SHIFT	4
+#define VFE_0_RDI_CFG_x_RDI_M0_SEL_MASK		(0xf << 4)
+#define VFE_0_RDI_CFG_x_RDI_EN_BIT		BIT(2)
+#define VFE_0_RDI_CFG_x_MIPI_EN_BITS		0x3
+
+#define VFE_0_CAMIF_CMD				0x478
+#define VFE_0_CAMIF_CMD_DISABLE_FRAME_BOUNDARY	0
+#define VFE_0_CAMIF_CMD_ENABLE_FRAME_BOUNDARY	1
+#define VFE_0_CAMIF_CMD_NO_CHANGE		3
+#define VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS	BIT(2)
+#define VFE_0_CAMIF_CFG				0x47c
+#define VFE_0_CAMIF_CFG_VFE_OUTPUT_EN		BIT(6)
+#define VFE_0_CAMIF_FRAME_CFG			0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG		0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG		0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG		0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN	0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN	0x49c
+#define VFE_0_CAMIF_STATUS			0x4a4
+#define VFE_0_CAMIF_STATUS_HALT			BIT(31)
+
+#define VFE_0_REG_UPDATE		0x4ac
+#define VFE_0_REG_UPDATE_RDIn(n)		BIT(1 + (n))
+#define VFE_0_REG_UPDATE_line_n(n)		\
+			((n) == VFE_LINE_PIX ? 1 : VFE_0_REG_UPDATE_RDIn(n))
+
+#define VFE_0_DEMUX_CFG				0x560
+#define VFE_0_DEMUX_CFG_PERIOD			0x3
+#define VFE_0_DEMUX_GAIN_0			0x564
+#define VFE_0_DEMUX_GAIN_0_CH0_EVEN		(0x80 << 0)
+#define VFE_0_DEMUX_GAIN_0_CH0_ODD		(0x80 << 16)
+#define VFE_0_DEMUX_GAIN_1			0x568
+#define VFE_0_DEMUX_GAIN_1_CH1			(0x80 << 0)
+#define VFE_0_DEMUX_GAIN_1_CH2			(0x80 << 16)
+#define VFE_0_DEMUX_EVEN_CFG			0x574
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_YUYV	0x9cac
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_YVYU	0xac9c
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_UYVY	0xc9ca
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_VYUY	0xcac9
+#define VFE_0_DEMUX_ODD_CFG			0x578
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_YUYV	0x9cac
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_YVYU	0xac9c
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_UYVY	0xc9ca
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_VYUY	0xcac9
+
+#define VFE_0_SCALE_ENC_Y_CFG			0x91c
+#define VFE_0_SCALE_ENC_Y_H_IMAGE_SIZE		0x920
+#define VFE_0_SCALE_ENC_Y_H_PHASE		0x924
+#define VFE_0_SCALE_ENC_Y_V_IMAGE_SIZE		0x934
+#define VFE_0_SCALE_ENC_Y_V_PHASE		0x938
+#define VFE_0_SCALE_ENC_CBCR_CFG		0x948
+#define VFE_0_SCALE_ENC_CBCR_H_IMAGE_SIZE	0x94c
+#define VFE_0_SCALE_ENC_CBCR_H_PHASE		0x950
+#define VFE_0_SCALE_ENC_CBCR_V_IMAGE_SIZE	0x960
+#define VFE_0_SCALE_ENC_CBCR_V_PHASE		0x964
+
+#define VFE_0_CROP_ENC_Y_WIDTH			0x974
+#define VFE_0_CROP_ENC_Y_HEIGHT			0x978
+#define VFE_0_CROP_ENC_CBCR_WIDTH		0x97c
+#define VFE_0_CROP_ENC_CBCR_HEIGHT		0x980
+
+#define VFE_0_CLAMP_ENC_MAX_CFG			0x984
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH0		(0xff << 0)
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH1		(0xff << 8)
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH2		(0xff << 16)
+#define VFE_0_CLAMP_ENC_MIN_CFG			0x988
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH0		(0x0 << 0)
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH1		(0x0 << 8)
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH2		(0x0 << 16)
+
+#define VFE_0_REALIGN_BUF_CFG			0xaac
+#define VFE_0_REALIGN_BUF_CFG_CB_ODD_PIXEL     BIT(2)
+#define VFE_0_REALIGN_BUF_CFG_CR_ODD_PIXEL     BIT(3)
+#define VFE_0_REALIGN_BUF_CFG_HSUB_ENABLE      BIT(4)
+
+#define VFE_0_BUS_IMAGE_MASTER_CMD		0xcec
+#define VFE_0_BUS_IMAGE_MASTER_n_SHIFT(x)	(2 * (x))
+
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define MSM_VFE_VFE0_UB_SIZE 2047
+#define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3)
+#define MSM_VFE_VFE1_UB_SIZE 1535
+#define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+	u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);
+
+	dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+	u32 bits = readl_relaxed(vfe->base + reg);
+
+	writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+	u32 bits = readl_relaxed(vfe->base + reg);
+
+	writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{
+	u32 reset_bits = VFE_0_GLOBAL_RESET_CMD_IDLE_CGC	|
+			 VFE_0_GLOBAL_RESET_CMD_DSP		|
+			 VFE_0_GLOBAL_RESET_CMD_TESTGEN		|
+			 VFE_0_GLOBAL_RESET_CMD_BUS_MISR	|
+			 VFE_0_GLOBAL_RESET_CMD_PM		|
+			 VFE_0_GLOBAL_RESET_CMD_REGISTER	|
+			 VFE_0_GLOBAL_RESET_CMD_BUS_BDG		|
+			 VFE_0_GLOBAL_RESET_CMD_BUS		|
+			 VFE_0_GLOBAL_RESET_CMD_CAMIF		|
+			 VFE_0_GLOBAL_RESET_CMD_CORE;
+
+	writel_relaxed(BIT(31), vfe->base + VFE_0_IRQ_MASK_0);
+
+	/* Enforce barrier between IRQ mask setup and global reset */
+	wmb();
+	writel_relaxed(reset_bits, vfe->base + VFE_0_GLOBAL_RESET_CMD);
+}
+
+static void vfe_halt_request(struct vfe_device *vfe)
+{
+	writel_relaxed(VFE_0_BUS_BDG_CMD_HALT_REQ,
+		       vfe->base + VFE_0_BUS_BDG_CMD);
+}
+
+static void vfe_halt_clear(struct vfe_device *vfe)
+{
+	writel_relaxed(0x0, vfe->base + VFE_0_BUS_BDG_CMD);
+}
+
+static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+	if (enable)
+		vfe_reg_set(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm),
+			1 << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT);
+	else
+		vfe_reg_clr(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm),
+			1 << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT);
+}
+
+#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
+
+static int vfe_word_per_line_by_pixel(u32 format, u32 pixel_per_line)
+{
+	int val = 0;
+
+	switch (format) {
+	case V4L2_PIX_FMT_NV12:
+	case V4L2_PIX_FMT_NV21:
+	case V4L2_PIX_FMT_NV16:
+	case V4L2_PIX_FMT_NV61:
+		val = CALC_WORD(pixel_per_line, 1, 8);
+		break;
+	case V4L2_PIX_FMT_YUYV:
+	case V4L2_PIX_FMT_YVYU:
+	case V4L2_PIX_FMT_UYVY:
+	case V4L2_PIX_FMT_VYUY:
+		val = CALC_WORD(pixel_per_line, 2, 8);
+		break;
+	}
+
+	return val;
+}
+
+static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
+{
+	return CALC_WORD(bytes_per_line, 1, 8);
+}
+
+static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
+			     u16 *width, u16 *height, u16 *bytesperline)
+{
+	switch (pix->pixelformat) {
+	case V4L2_PIX_FMT_NV12:
+	case V4L2_PIX_FMT_NV21:
+		*width = pix->width;
+		*height = pix->height;
+		*bytesperline = pix->plane_fmt[0].bytesperline;
+		if (plane == 1)
+			*height /= 2;
+		break;
+	case V4L2_PIX_FMT_NV16:
+	case V4L2_PIX_FMT_NV61:
+		*width = pix->width;
+		*height = pix->height;
+		*bytesperline = pix->plane_fmt[0].bytesperline;
+		break;
+	case V4L2_PIX_FMT_YUYV:
+	case V4L2_PIX_FMT_YVYU:
+	case V4L2_PIX_FMT_VYUY:
+	case V4L2_PIX_FMT_UYVY:
+		*width = pix->width;
+		*height = pix->height;
+		*bytesperline = pix->plane_fmt[plane].bytesperline;
+		break;
+
+	}
+}
+
+static void vfe_wm_line_based(struct vfe_device *vfe, u32 wm,
+			      struct v4l2_pix_format_mplane *pix,
+			      u8 plane, u32 enable)
+{
+	u32 reg;
+
+	if (enable) {
+		u16 width = 0, height = 0, bytesperline = 0, wpl;
+
+		vfe_get_wm_sizes(pix, plane, &width, &height, &bytesperline);
+
+		wpl = vfe_word_per_line_by_pixel(pix->pixelformat, width);
+
+		reg = height - 1;
+		reg |= ((wpl + 3) / 4 - 1) << 16;
+
+		writel_relaxed(reg, vfe->base +
+			       VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(wm));
+
+		wpl = vfe_word_per_line_by_bytes(bytesperline);
+
+		reg = 0x3;
+		reg |= (height - 1) << 2;
+		reg |= ((wpl + 1) / 2) << 16;
+
+		writel_relaxed(reg, vfe->base +
+			       VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(wm));
+	} else {
+		writel_relaxed(0, vfe->base +
+			       VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(wm));
+		writel_relaxed(0, vfe->base +
+			       VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(wm));
+	}
+}
+
+static void vfe_wm_set_framedrop_period(struct vfe_device *vfe, u8 wm, u8 per)
+{
+	u32 reg;
+
+	reg = readl_relaxed(vfe->base +
+			    VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm));
+
+	reg &= ~(VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK);
+
+	reg |= (per << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_SHIFT)
+		& VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK;
+
+	writel_relaxed(reg,
+		       vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm));
+}
+
+static void vfe_wm_set_framedrop_pattern(struct vfe_device *vfe, u8 wm,
+					 u32 pattern)
+{
+	writel_relaxed(pattern,
+	       vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_FRAMEDROP_PATTERN(wm));
+}
+
+static void vfe_wm_set_ub_cfg(struct vfe_device *vfe, u8 wm,
+			      u16 offset, u16 depth)
+{
+	u32 reg;
+
+	reg = (offset << VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG_OFFSET_SHIFT) |
+		depth;
+	writel_relaxed(reg, vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG(wm));
+}
+
+static void vfe_bus_reload_wm(struct vfe_device *vfe, u8 wm)
+{
+	/* Enforce barrier between any outstanding register write */
+	wmb();
+
+	writel_relaxed(VFE_0_BUS_CMD_Mx_RLD_CMD(wm), vfe->base + VFE_0_BUS_CMD);
+
+	/* Use barrier to make sure bus reload is issued before anything else */
+	wmb();
+}
+
+static void vfe_wm_set_ping_addr(struct vfe_device *vfe, u8 wm, u32 addr)
+{
+	writel_relaxed(addr,
+		       vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_PING_ADDR(wm));
+}
+
+static void vfe_wm_set_pong_addr(struct vfe_device *vfe, u8 wm, u32 addr)
+{
+	writel_relaxed(addr,
+		       vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_PONG_ADDR(wm));
+}
+
+static int vfe_wm_get_ping_pong_status(struct vfe_device *vfe, u8 wm)
+{
+	u32 reg;
+
+	reg = readl_relaxed(vfe->base + VFE_0_BUS_PING_PONG_STATUS);
+
+	return (reg >> wm) & 0x1;
+}
+
+static void vfe_bus_enable_wr_if(struct vfe_device *vfe, u8 enable)
+{
+	if (enable)
+		writel_relaxed(0x101, vfe->base + VFE_0_BUS_CFG);
+	else
+		writel_relaxed(0, vfe->base + VFE_0_BUS_CFG);
+}
+
+static void vfe_bus_connect_wm_to_rdi(struct vfe_device *vfe, u8 wm,
+				      enum vfe_line_id id)
+{
+	u32 reg;
+
+	reg = VFE_0_RDI_CFG_x_MIPI_EN_BITS;
+	vfe_reg_set(vfe, VFE_0_RDI_CFG_x(0), reg);
+
+	reg = VFE_0_RDI_CFG_x_RDI_EN_BIT;
+	reg |= ((3 * id) << VFE_0_RDI_CFG_x_RDI_STREAM_SEL_SHIFT) &
+		VFE_0_RDI_CFG_x_RDI_STREAM_SEL_MASK;
+	vfe_reg_set(vfe, VFE_0_RDI_CFG_x(id), reg);
+
+	switch (id) {
+	case VFE_LINE_RDI0:
+	default:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	case VFE_LINE_RDI1:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	case VFE_LINE_RDI2:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	}
+
+	if (wm % 2 == 1)
+		reg <<= 16;
+
+	vfe_reg_set(vfe, VFE_0_BUS_XBAR_CFG_x(wm), reg);
+}
+
+static void vfe_wm_set_subsample(struct vfe_device *vfe, u8 wm)
+{
+	writel_relaxed(VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN_DEF,
+	       vfe->base +
+	       VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN(wm));
+}
+
+static void vfe_bus_disconnect_wm_from_rdi(struct vfe_device *vfe, u8 wm,
+					   enum vfe_line_id id)
+{
+	u32 reg;
+
+	reg = VFE_0_RDI_CFG_x_RDI_EN_BIT;
+	vfe_reg_clr(vfe, VFE_0_RDI_CFG_x(id), reg);
+
+	switch (id) {
+	case VFE_LINE_RDI0:
+	default:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	case VFE_LINE_RDI1:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	case VFE_LINE_RDI2:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2 <<
+		      VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+		break;
+	}
+
+	if (wm % 2 == 1)
+		reg <<= 16;
+
+	vfe_reg_clr(vfe, VFE_0_BUS_XBAR_CFG_x(wm), reg);
+}
+
+static void vfe_set_xbar_cfg(struct vfe_device *vfe, struct vfe_output *output,
+			     u8 enable)
+{
+	struct vfe_line *line = container_of(output, struct vfe_line, output);
+	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+	u32 reg;
+
+	switch (p) {
+	case V4L2_PIX_FMT_NV12:
+	case V4L2_PIX_FMT_NV21:
+	case V4L2_PIX_FMT_NV16:
+	case V4L2_PIX_FMT_NV61:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_LUMA <<
+			VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+
+		if (output->wm_idx[0] % 2 == 1)
+			reg <<= 16;
+
+		if (enable)
+			vfe_reg_set(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+				    reg);
+		else
+			vfe_reg_clr(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+				    reg);
+
+		reg = VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN;
+		if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV16)
+			reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA;
+
+		if (output->wm_idx[1] % 2 == 1)
+			reg <<= 16;
+
+		if (enable)
+			vfe_reg_set(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[1]),
+				    reg);
+		else
+			vfe_reg_clr(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[1]),
+				    reg);
+		break;
+	case V4L2_PIX_FMT_YUYV:
+	case V4L2_PIX_FMT_YVYU:
+	case V4L2_PIX_FMT_VYUY:
+	case V4L2_PIX_FMT_UYVY:
+		reg = VFE_0_BUS_XBAR_CFG_x_M_REALIGN_BUF_EN;
+		reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN;
+
+		if (p == V4L2_PIX_FMT_YUYV || p == V4L2_PIX_FMT_YVYU)
+			reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA;
+
+		if (output->wm_idx[0] % 2 == 1)
+			reg <<= 16;
+
+		if (enable)
+			vfe_reg_set(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+				    reg);
+		else
+			vfe_reg_clr(vfe,
+				    VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+				    reg);
+		break;
+	default:
+		break;
+	}
+}
+
+static void vfe_set_realign_cfg(struct vfe_device *vfe, struct vfe_line *line,
+				u8 enable)
+{
+	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+	u32 val = VFE_0_MODULE_ZOOM_EN_REALIGN_BUF;
+
+	if (p != V4L2_PIX_FMT_YUYV && p != V4L2_PIX_FMT_YVYU &&
+			p != V4L2_PIX_FMT_VYUY && p != V4L2_PIX_FMT_UYVY)
+		return;
+
+	if (enable) {
+		vfe_reg_set(vfe, VFE_0_MODULE_ZOOM_EN, val);
+	} else {
+		vfe_reg_clr(vfe, VFE_0_MODULE_ZOOM_EN, val);
+		return;
+	}
+
+	val = VFE_0_REALIGN_BUF_CFG_HSUB_ENABLE;
+
+	if (p == V4L2_PIX_FMT_UYVY || p == V4L2_PIX_FMT_YUYV)
+		val |= VFE_0_REALIGN_BUF_CFG_CR_ODD_PIXEL;
+	else
+		val |= VFE_0_REALIGN_BUF_CFG_CB_ODD_PIXEL;
+
+	writel_relaxed(val, vfe->base + VFE_0_REALIGN_BUF_CFG);
+}
+
+static void vfe_set_rdi_cid(struct vfe_device *vfe, enum vfe_line_id id, u8 cid)
+{
+	vfe_reg_clr(vfe, VFE_0_RDI_CFG_x(id),
+		    VFE_0_RDI_CFG_x_RDI_M0_SEL_MASK);
+
+	vfe_reg_set(vfe, VFE_0_RDI_CFG_x(id),
+		    cid << VFE_0_RDI_CFG_x_RDI_M0_SEL_SHIFT);
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+	vfe->reg_update |= VFE_0_REG_UPDATE_line_n(line_id);
+
+	/* Enforce barrier between line update and commit */
+	wmb();
+
+	writel_relaxed(vfe->reg_update, vfe->base + VFE_0_REG_UPDATE);
+
+	/* Make sure register update is issued before further reg writes */
+	wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+					enum vfe_line_id line_id)
+{
+	vfe->reg_update &= ~VFE_0_REG_UPDATE_line_n(line_id);
+}
+
+static void vfe_enable_irq_wm_line(struct vfe_device *vfe, u8 wm,
+				   enum vfe_line_id line_id, u8 enable)
+{
+	u32 irq_en0 = VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(wm) |
+		      VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(line_id);
+	u32 irq_en1 = VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(wm) |
+		      VFE_0_IRQ_MASK_1_RDIn_SOF(line_id);
+
+	if (enable) {
+		vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+		vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+	} else {
+		vfe_reg_clr(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+		vfe_reg_clr(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+	}
+}
+
+static void vfe_enable_irq_pix_line(struct vfe_device *vfe, u8 comp,
+				    enum vfe_line_id line_id, u8 enable)
+{
+	struct vfe_output *output = &vfe->line[line_id].output;
+	unsigned int i;
+	u32 irq_en0;
+	u32 irq_en1;
+	u32 comp_mask = 0;
+
+	irq_en0 = VFE_0_IRQ_MASK_0_CAMIF_SOF;
+	irq_en0 |= VFE_0_IRQ_MASK_0_CAMIF_EOF;
+	irq_en0 |= VFE_0_IRQ_MASK_0_IMAGE_COMPOSITE_DONE_n(comp);
+	irq_en0 |= VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(line_id);
+	irq_en1 = VFE_0_IRQ_MASK_1_CAMIF_ERROR;
+	for (i = 0; i < output->wm_num; i++) {
+		irq_en1 |= VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(
+							output->wm_idx[i]);
+		comp_mask |= (1 << output->wm_idx[i]) << comp * 8;
+	}
+
+	if (enable) {
+		vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+		vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+		vfe_reg_set(vfe, VFE_0_IRQ_COMPOSITE_MASK_0, comp_mask);
+	} else {
+		vfe_reg_clr(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+		vfe_reg_clr(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+		vfe_reg_clr(vfe, VFE_0_IRQ_COMPOSITE_MASK_0, comp_mask);
+	}
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+	u32 irq_en0 = VFE_0_IRQ_MASK_0_RESET_ACK;
+	u32 irq_en1 = VFE_0_IRQ_MASK_1_VIOLATION |
+		      VFE_0_IRQ_MASK_1_BUS_BDG_HALT_ACK;
+
+	vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+	vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+}
+
+static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+	u32 val, even_cfg, odd_cfg;
+
+	writel_relaxed(VFE_0_DEMUX_CFG_PERIOD, vfe->base + VFE_0_DEMUX_CFG);
+
+	val = VFE_0_DEMUX_GAIN_0_CH0_EVEN | VFE_0_DEMUX_GAIN_0_CH0_ODD;
+	writel_relaxed(val, vfe->base + VFE_0_DEMUX_GAIN_0);
+
+	val = VFE_0_DEMUX_GAIN_1_CH1 | VFE_0_DEMUX_GAIN_1_CH2;
+	writel_relaxed(val, vfe->base + VFE_0_DEMUX_GAIN_1);
+
+	switch (line->fmt[MSM_VFE_PAD_SINK].code) {
+	case MEDIA_BUS_FMT_YUYV8_2X8:
+		even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_YUYV;
+		odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_YUYV;
+		break;
+	case MEDIA_BUS_FMT_YVYU8_2X8:
+		even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_YVYU;
+		odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_YVYU;
+		break;
+	case MEDIA_BUS_FMT_UYVY8_2X8:
+	default:
+		even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_UYVY;
+		odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_UYVY;
+		break;
+	case MEDIA_BUS_FMT_VYUY8_2X8:
+		even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_VYUY;
+		odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_VYUY;
+		break;
+	}
+
+	writel_relaxed(even_cfg, vfe->base + VFE_0_DEMUX_EVEN_CFG);
+	writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
+}
+
+static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+	u32 reg;
+	u16 input, output;
+	u8 interp_reso;
+	u32 phase_mult;
+
+	writel_relaxed(0x3, vfe->base + VFE_0_SCALE_ENC_Y_CFG);
+
+	input = line->fmt[MSM_VFE_PAD_SINK].width - 1;
+	output = line->compose.width - 1;
+	reg = (output << 16) | input;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_H_IMAGE_SIZE);
+
+	interp_reso = vfe_calc_interp_reso(input, output);
+	phase_mult = input * (1 << (14 + interp_reso)) / output;
+	reg = (interp_reso << 28) | phase_mult;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_H_PHASE);
+
+	input = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+	output = line->compose.height - 1;
+	reg = (output << 16) | input;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_V_IMAGE_SIZE);
+
+	interp_reso = vfe_calc_interp_reso(input, output);
+	phase_mult = input * (1 << (14 + interp_reso)) / output;
+	reg = (interp_reso << 28) | phase_mult;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_V_PHASE);
+
+	writel_relaxed(0x3, vfe->base + VFE_0_SCALE_ENC_CBCR_CFG);
+
+	input = line->fmt[MSM_VFE_PAD_SINK].width - 1;
+	output = line->compose.width / 2 - 1;
+	reg = (output << 16) | input;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_H_IMAGE_SIZE);
+
+	interp_reso = vfe_calc_interp_reso(input, output);
+	phase_mult = input * (1 << (14 + interp_reso)) / output;
+	reg = (interp_reso << 28) | phase_mult;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_H_PHASE);
+
+	input = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+	output = line->compose.height - 1;
+	if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV21)
+		output = line->compose.height / 2 - 1;
+	reg = (output << 16) | input;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_V_IMAGE_SIZE);
+
+	interp_reso = vfe_calc_interp_reso(input, output);
+	phase_mult = input * (1 << (14 + interp_reso)) / output;
+	reg = (interp_reso << 28) | phase_mult;
+	writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_V_PHASE);
+}
+
+static void vfe_set_crop_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+	u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+	u32 reg;
+	u16 first, last;
+
+	first = line->crop.left;
+	last = line->crop.left + line->crop.width - 1;
+	reg = (first << 16) | last;
+	writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_Y_WIDTH);
+
+	first = line->crop.top;
+	last = line->crop.top + line->crop.height - 1;
+	reg = (first << 16) | last;
+	writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_Y_HEIGHT);
+
+	first = line->crop.left / 2;
+	last = line->crop.left / 2 + line->crop.width / 2 - 1;
+	reg = (first << 16) | last;
+	writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_CBCR_WIDTH);
+
+	first = line->crop.top;
+	last = line->crop.top + line->crop.height - 1;
+	if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV21) {
+		first = line->crop.top / 2;
+		last = line->crop.top / 2 + line->crop.height / 2 - 1;
+	}
+	reg = (first << 16) | last;
+	writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_CBCR_HEIGHT);
+}
+
+static void vfe_set_clamp_cfg(struct vfe_device *vfe)
+{
+	u32 val = VFE_0_CLAMP_ENC_MAX_CFG_CH0 |
+		VFE_0_CLAMP_ENC_MAX_CFG_CH1 |
+		VFE_0_CLAMP_ENC_MAX_CFG_CH2;
+
+	writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MAX_CFG);
+
+	val = VFE_0_CLAMP_ENC_MIN_CFG_CH0 |
+		VFE_0_CLAMP_ENC_MIN_CFG_CH1 |
+		VFE_0_CLAMP_ENC_MIN_CFG_CH2;
+
+	writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MIN_CFG);
+}
+
+static void vfe_set_cgc_override(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+	/* empty */
+}
+
+static void vfe_set_camif_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+	u32 val;
+
+	switch (line->fmt[MSM_VFE_PAD_SINK].code) {
+	case MEDIA_BUS_FMT_YUYV8_2X8:
+		val = VFE_0_CORE_CFG_PIXEL_PATTERN_YCBYCR;
+		break;
+	case MEDIA_BUS_FMT_YVYU8_2X8:
+		val = VFE_0_CORE_CFG_PIXEL_PATTERN_YCRYCB;
+		break;
+	case MEDIA_BUS_FMT_UYVY8_2X8:
+	default:
+		val = VFE_0_CORE_CFG_PIXEL_PATTERN_CBYCRY;
+		break;
+	case MEDIA_BUS_FMT_VYUY8_2X8:
+		val = VFE_0_CORE_CFG_PIXEL_PATTERN_CRYCBY;
+		break;
+	}
+
+	val |= VFE_0_CORE_CFG_COMPOSITE_REG_UPDATE_EN;
+	writel_relaxed(val, vfe->base + VFE_0_CORE_CFG);
+
+	val = line->fmt[MSM_VFE_PAD_SINK].width * 2 - 1;
+	val |= (line->fmt[MSM_VFE_PAD_SINK].height - 1) << 16;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_FRAME_CFG);
+
+	val = line->fmt[MSM_VFE_PAD_SINK].width * 2 - 1;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_WINDOW_WIDTH_CFG);
+
+	val = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_WINDOW_HEIGHT_CFG);
+
+	val = 0xffffffff;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_SUBSAMPLE_CFG);
+
+	val = 0xffffffff;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN);
+
+	val = 0xffffffff;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN);
+
+	val = VFE_0_RDI_CFG_x_MIPI_EN_BITS;
+	vfe_reg_set(vfe, VFE_0_RDI_CFG_x(0), val);
+
+	val = VFE_0_CAMIF_CFG_VFE_OUTPUT_EN;
+	writel_relaxed(val, vfe->base + VFE_0_CAMIF_CFG);
+}
+
+static void vfe_set_camif_cmd(struct vfe_device *vfe, u8 enable)
+{
+	u32 cmd;
+
+	cmd = VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS | VFE_0_CAMIF_CMD_NO_CHANGE;
+	writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+
+	/* Make sure camif command is issued written before it is changed again */
+	wmb();
+
+	if (enable)
+		cmd = VFE_0_CAMIF_CMD_ENABLE_FRAME_BOUNDARY;
+	else
+		cmd = VFE_0_CAMIF_CMD_DISABLE_FRAME_BOUNDARY;
+
+	writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+}
+
+static void vfe_set_module_cfg(struct vfe_device *vfe, u8 enable)
+{
+	u32 val_lens = VFE_0_MODULE_LENS_EN_DEMUX |
+		       VFE_0_MODULE_LENS_EN_CHROMA_UPSAMPLE;
+	u32 val_zoom = VFE_0_MODULE_ZOOM_EN_SCALE_ENC |
+		       VFE_0_MODULE_ZOOM_EN_CROP_ENC;
+
+	if (enable) {
+		vfe_reg_set(vfe, VFE_0_MODULE_LENS_EN, val_lens);
+		vfe_reg_set(vfe, VFE_0_MODULE_ZOOM_EN, val_zoom);
+	} else {
+		vfe_reg_clr(vfe, VFE_0_MODULE_LENS_EN, val_lens);
+		vfe_reg_clr(vfe, VFE_0_MODULE_ZOOM_EN, val_zoom);
+	}
+}
+
+static int vfe_camif_wait_for_stop(struct vfe_device *vfe, struct device *dev)
+{
+	u32 val;
+	int ret;
+
+	ret = readl_poll_timeout(vfe->base + VFE_0_CAMIF_STATUS,
+				 val,
+				 (val & VFE_0_CAMIF_STATUS_HALT),
+				 CAMIF_TIMEOUT_SLEEP_US,
+				 CAMIF_TIMEOUT_ALL_US);
+	if (ret < 0)
+		dev_err(dev, "%s: camif stop timeout\n", __func__);
+
+	return ret;
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+	struct vfe_device *vfe = dev;
+	u32 value0, value1;
+	int i, j;
+
+	vfe->ops->isr_read(vfe, &value0, &value1);
+
+	dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+		value0, value1);
+
+	if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
+		vfe->isr_ops.reset_ack(vfe);

drivers/media/platform/qcom/camss/camss-vfe-4-8.c line 1004

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +10 -0
+
+	if (value1 & VFE_0_IRQ_STATUS_1_VIOLATION)
+		vfe->ops->violation_read(vfe);
+
+	if (value1 & VFE_0_IRQ_STATUS_1_BUS_BDG_HALT_ACK)
+		vfe->isr_ops.halt_ack(vfe);
+
+	for (i = VFE_LINE_RDI0; i <= VFE_LINE_PIX; i++)
+		if (value0 & VFE_0_IRQ_STATUS_0_line_n_REG_UPDATE(i))
+			vfe->isr_ops.reg_update(vfe, i);

- calling this one with i equal to VFE_LINE_PIX would result in using vfe->line[VFE_LINE_PIX] without explicit check against vfe->line_num. But as this vfe_isr() implementation is specifically for VFE version 4.8, this is no problem.
Maybe the "for (i = VFE_LINE_RDI0; i <= VFE_LINE_PIX; i++)" cycle could be changed to use "i < VFE_LINE_NUM_GEN1" or "i < vfe->line_num" instead, but I am not sure if it makes the code cleaner (functionally there is no difference; VFE_LINE_PIX == 3, VFE_LINE_NUM_GEN1 == 4, and for the 4.8 version vfe->line_num == VFE_LINE_NUM_GEN1).

In any case,

Thanks,
Andrey

Quoted 672 lines
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +161 -0
+	if (value0 & VFE_0_IRQ_STATUS_0_CAMIF_SOF)
+		vfe->isr_ops.sof(vfe, VFE_LINE_PIX);
+
+	for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+		if (value1 & VFE_0_IRQ_STATUS_1_RDIn_SOF(i))
+			vfe->isr_ops.sof(vfe, i);
+
+	for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+		if (value0 & VFE_0_IRQ_STATUS_0_IMAGE_COMPOSITE_DONE_n(i)) {
+			vfe->isr_ops.comp_done(vfe, i);
+			for (j = 0; j < ARRAY_SIZE(vfe->wm_output_map); j++)
+				if (vfe->wm_output_map[j] == VFE_LINE_PIX)
+					value0 &= ~VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(j);
+		}
+
+	for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++)
+		if (value0 & VFE_0_IRQ_STATUS_0_IMAGE_MASTER_n_PING_PONG(i))
+			vfe->isr_ops.wm_done(vfe, i);
+
+	return IRQ_HANDLED;
+}
+
+static u16 vfe_get_ub_size(u8 vfe_id)
+{
+	/* On VFE4.8 the ub-size is the same on both instances */
+	return MSM_VFE_VFE0_UB_SIZE_RDI;
+}
+
+static void vfe_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+	if (enable)
+		writel_relaxed(2 << VFE_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
+			       vfe->base + VFE_0_BUS_IMAGE_MASTER_CMD);
+	else
+		writel_relaxed(1 << VFE_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
+			       vfe->base + VFE_0_BUS_IMAGE_MASTER_CMD);
+
+	/* The WM must be enabled before sending other commands */
+	wmb();
+}
+
+static void vfe_set_qos(struct vfe_device *vfe)
+{
+	u32 val = VFE_0_BUS_BDG_QOS_CFG_0_CFG;
+	u32 val3 = VFE_0_BUS_BDG_QOS_CFG_3_CFG;
+	u32 val4 = VFE_0_BUS_BDG_QOS_CFG_4_CFG;
+	u32 val7 = VFE_0_BUS_BDG_QOS_CFG_7_CFG;
+
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_0);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_1);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_2);
+	writel_relaxed(val3, vfe->base + VFE_0_BUS_BDG_QOS_CFG_3);
+	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_4);
+	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
+	writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
+	writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
+}
+
+static void vfe_set_ds(struct vfe_device *vfe)
+{
+	u32 val = VFE_0_BUS_BDG_DS_CFG_0_CFG;
+	u32 val16 = VFE_0_BUS_BDG_DS_CFG_16_CFG;
+
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_0);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_1);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_2);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_3);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_4);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_5);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_6);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_7);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_8);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_9);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_10);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_11);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_12);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_13);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_14);
+	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_15);
+	writel_relaxed(val16, vfe->base + VFE_0_BUS_BDG_DS_CFG_16);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
+{
+	*value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
+	*value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
+
+	writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
+	writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
+
+	/* Enforce barrier between local & global IRQ clear */
+	wmb();
+	writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+	u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
+
+	pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_8 = {
+	.bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+	.bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+	.bus_enable_wr_if = vfe_bus_enable_wr_if,
+	.bus_reload_wm = vfe_bus_reload_wm,
+	.camif_wait_for_stop = vfe_camif_wait_for_stop,
+	.enable_irq_common = vfe_enable_irq_common,
+	.enable_irq_pix_line = vfe_enable_irq_pix_line,
+	.enable_irq_wm_line = vfe_enable_irq_wm_line,
+	.get_ub_size = vfe_get_ub_size,
+	.halt_clear = vfe_halt_clear,
+	.halt_request = vfe_halt_request,
+	.set_camif_cfg = vfe_set_camif_cfg,
+	.set_camif_cmd = vfe_set_camif_cmd,
+	.set_cgc_override = vfe_set_cgc_override,
+	.set_clamp_cfg = vfe_set_clamp_cfg,
+	.set_crop_cfg = vfe_set_crop_cfg,
+	.set_demux_cfg = vfe_set_demux_cfg,
+	.set_ds = vfe_set_ds,
+	.set_module_cfg = vfe_set_module_cfg,
+	.set_qos = vfe_set_qos,
+	.set_rdi_cid = vfe_set_rdi_cid,
+	.set_realign_cfg = vfe_set_realign_cfg,
+	.set_scale_cfg = vfe_set_scale_cfg,
+	.set_xbar_cfg = vfe_set_xbar_cfg,
+	.wm_enable = vfe_wm_enable,
+	.wm_frame_based = vfe_wm_frame_based,
+	.wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
+	.wm_line_based = vfe_wm_line_based,
+	.wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
+	.wm_set_framedrop_period = vfe_wm_set_framedrop_period,
+	.wm_set_ping_addr = vfe_wm_set_ping_addr,
+	.wm_set_pong_addr = vfe_wm_set_pong_addr,
+	.wm_set_subsample = vfe_wm_set_subsample,
+	.wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+	vfe->isr_ops = vfe_isr_ops_gen1;
+	vfe->ops_gen1 = &vfe_ops_gen1_4_8;
+	vfe->video_ops = vfe_video_ops_gen1;
+
+	vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_8 = {
+	.global_reset = vfe_global_reset,
+	.hw_version_read = vfe_hw_version_read,
+	.isr_read = vfe_isr_read,
+	.isr = vfe_isr,
+	.reg_update_clear = vfe_reg_update_clear,
+	.reg_update = vfe_reg_update,
+	.subdev_init = vfe_subdev_init,
+	.vfe_disable = vfe_gen1_disable,
+	.vfe_enable = vfe_gen1_enable,
+	.vfe_halt = vfe_gen1_halt,
+	.violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +505 -0
new file mode 100644
index 000000000000..b98f30f99e89
@@ -0,0 +1,763 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-gen1.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE Common functionality for Gen 1 versions of hw (4.1, 4.7..)
+ *
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+
+
+#include "camss.h"
+#include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
+/* Max number of frame drop updates per frame */
+#define VFE_FRAME_DROP_UPDATES 2
+#define VFE_NEXT_SOF_MS 500
+
+
+int vfe_gen1_halt(struct vfe_device *vfe)
+{
+	unsigned long time;
+
+	return 0;
+
+	reinit_completion(&vfe->halt_complete);
+
+	vfe->ops_gen1->halt_request(vfe);
+
+	time = wait_for_completion_timeout(&vfe->halt_complete,
+					   msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+	if (!time) {
+		dev_err(vfe->camss->dev, "VFE halt timeout\n");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output = &line->output;
+	const struct vfe_hw_ops *ops = vfe->ops;
+	unsigned long flags;
+	unsigned long time;
+	unsigned int i;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	output->gen1.wait_sof = 1;
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	time = wait_for_completion_timeout(&output->sof, msecs_to_jiffies(VFE_NEXT_SOF_MS));
+	if (!time)
+		dev_err(vfe->camss->dev, "VFE sof timeout\n");
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+	for (i = 0; i < output->wm_num; i++)
+		vfe->ops_gen1->wm_enable(vfe, output->wm_idx[i], 0);
+
+	ops->reg_update(vfe, line->id);
+	output->wait_reg_update = 1;
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	time = wait_for_completion_timeout(&output->reg_update, msecs_to_jiffies(VFE_NEXT_SOF_MS));
+	if (!time)
+		dev_err(vfe->camss->dev, "VFE reg update timeout\n");
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	if (line->id != VFE_LINE_PIX) {
+		vfe->ops_gen1->wm_frame_based(vfe, output->wm_idx[0], 0);
+		vfe->ops_gen1->bus_disconnect_wm_from_rdi(vfe, output->wm_idx[0], line->id);
+		vfe->ops_gen1->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 0);
+		vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[0], 0);
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+	} else {
+		for (i = 0; i < output->wm_num; i++) {
+			vfe->ops_gen1->wm_line_based(vfe, output->wm_idx[i], NULL, i, 0);
+			vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[i], 0);
+		}
+
+		vfe->ops_gen1->enable_irq_pix_line(vfe, 0, line->id, 0);
+		vfe->ops_gen1->set_module_cfg(vfe, 0);
+		vfe->ops_gen1->set_realign_cfg(vfe, line, 0);
+		vfe->ops_gen1->set_xbar_cfg(vfe, output, 0);
+		vfe->ops_gen1->set_camif_cmd(vfe, 0);
+
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+		vfe->ops_gen1->camif_wait_for_stop(vfe, vfe->camss->dev);
+	}
+
+	return 0;
+}
+
+/*
+ * vfe_gen1_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_gen1_disable(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+
+	vfe_disable_output(line);
+
+	vfe_put_output(line);
+
+	mutex_lock(&vfe->stream_lock);
+
+	if (vfe->stream_count == 1)
+		vfe->ops_gen1->bus_enable_wr_if(vfe, 0);
+
+	vfe->stream_count--;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	return 0;
+}
+
+static void vfe_output_init_addrs(struct vfe_device *vfe,
+				  struct vfe_output *output, u8 sync,
+				  struct vfe_line *line)
+{
+	u32 ping_addr;
+	u32 pong_addr;
+	unsigned int i;
+
+	output->gen1.active_buf = 0;
+
+	for (i = 0; i < output->wm_num; i++) {
+		if (output->buf[0])
+			ping_addr = output->buf[0]->addr[i];
+		else
+			ping_addr = 0;
+
+		if (output->buf[1])
+			pong_addr = output->buf[1]->addr[i];
+		else
+			pong_addr = ping_addr;
+
+		vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], ping_addr);
+		vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], pong_addr);
+		if (sync)
+			vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+	}
+}
+
+static void vfe_output_frame_drop(struct vfe_device *vfe,
+				  struct vfe_output *output,
+				  u32 drop_pattern)
+{
+	u8 drop_period;
+	unsigned int i;
+
+	/* We need to toggle update period to be valid on next frame */
+	output->drop_update_idx++;
+	output->drop_update_idx %= VFE_FRAME_DROP_UPDATES;
+	drop_period = VFE_FRAME_DROP_VAL + output->drop_update_idx;
+
+	for (i = 0; i < output->wm_num; i++) {
+		vfe->ops_gen1->wm_set_framedrop_period(vfe, output->wm_idx[i], drop_period);
+		vfe->ops_gen1->wm_set_framedrop_pattern(vfe, output->wm_idx[i], drop_pattern);
+	}
+
+	vfe->ops->reg_update(vfe, container_of(output, struct vfe_line, output)->id);
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output = &line->output;
+	const struct vfe_hw_ops *ops = vfe->ops;
+	struct media_entity *sensor;
+	unsigned long flags;
+	unsigned int frame_skip = 0;
+	unsigned int i;
+	u16 ub_size;
+
+	ub_size = vfe->ops_gen1->get_ub_size(vfe->id);
+	if (!ub_size)
+		return -EINVAL;
+
+	sensor = camss_find_sensor(&line->subdev.entity);
+	if (sensor) {
+		struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+		v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+		/* Max frame skip is 29 frames */
+		if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+			frame_skip = VFE_FRAME_DROP_VAL - 1;
+	}
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	ops->reg_update_clear(vfe, line->id);
+
+	if (output->state != VFE_OUTPUT_RESERVED) {
+		dev_err(vfe->camss->dev, "Output is not in reserved state %d\n", output->state);
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+		return -EINVAL;
+	}
+	output->state = VFE_OUTPUT_IDLE;
+
+	output->buf[0] = vfe_buf_get_pending(output);
+	output->buf[1] = vfe_buf_get_pending(output);
+
+	if (!output->buf[0] && output->buf[1]) {
+		output->buf[0] = output->buf[1];
+		output->buf[1] = NULL;
+	}
+
+	if (output->buf[0])
+		output->state = VFE_OUTPUT_SINGLE;
+
+	if (output->buf[1])
+		output->state = VFE_OUTPUT_CONTINUOUS;
+
+	switch (output->state) {
+	case VFE_OUTPUT_SINGLE:
+		vfe_output_frame_drop(vfe, output, 1 << frame_skip);
+		break;
+	case VFE_OUTPUT_CONTINUOUS:
+		vfe_output_frame_drop(vfe, output, 3 << frame_skip);
+		break;
+	default:
+		vfe_output_frame_drop(vfe, output, 0);
+		break;
+	}
+
+	output->sequence = 0;
+	output->gen1.wait_sof = 0;
+	output->wait_reg_update = 0;
+	reinit_completion(&output->sof);
+	reinit_completion(&output->reg_update);
+
+	vfe_output_init_addrs(vfe, output, 0, line);
+
+	if (line->id != VFE_LINE_PIX) {
+		vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[0], 1);
+		vfe->ops_gen1->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 1);
+		vfe->ops_gen1->bus_connect_wm_to_rdi(vfe, output->wm_idx[0], line->id);
+		vfe->ops_gen1->wm_set_subsample(vfe, output->wm_idx[0]);
+		vfe->ops_gen1->set_rdi_cid(vfe, line->id, 0);
+		vfe->ops_gen1->wm_set_ub_cfg(vfe, output->wm_idx[0],
+					    (ub_size + 1) * output->wm_idx[0], ub_size);
+		vfe->ops_gen1->wm_frame_based(vfe, output->wm_idx[0], 1);
+		vfe->ops_gen1->wm_enable(vfe, output->wm_idx[0], 1);
+		vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[0]);
+	} else {
+		ub_size /= output->wm_num;
+		for (i = 0; i < output->wm_num; i++) {
+			vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[i], 1);
+			vfe->ops_gen1->wm_set_subsample(vfe, output->wm_idx[i]);
+			vfe->ops_gen1->wm_set_ub_cfg(vfe, output->wm_idx[i],
+						     (ub_size + 1) * output->wm_idx[i], ub_size);
+			vfe->ops_gen1->wm_line_based(vfe, output->wm_idx[i],
+						     &line->video_out.active_fmt.fmt.pix_mp, i, 1);
+			vfe->ops_gen1->wm_enable(vfe, output->wm_idx[i], 1);
+			vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+		}
+		vfe->ops_gen1->enable_irq_pix_line(vfe, 0, line->id, 1);
+		vfe->ops_gen1->set_module_cfg(vfe, 1);
+		vfe->ops_gen1->set_camif_cfg(vfe, line);
+		vfe->ops_gen1->set_realign_cfg(vfe, line, 1);
+		vfe->ops_gen1->set_xbar_cfg(vfe, output, 1);
+		vfe->ops_gen1->set_demux_cfg(vfe, line);
+		vfe->ops_gen1->set_scale_cfg(vfe, line);
+		vfe->ops_gen1->set_crop_cfg(vfe, line);
+		vfe->ops_gen1->set_clamp_cfg(vfe);
+		vfe->ops_gen1->set_camif_cmd(vfe, 1);
+	}
+
+	ops->reg_update(vfe, line->id);
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output;
+	struct v4l2_format *f = &line->video_out.active_fmt;
+	unsigned long flags;
+	int i;
+	int wm_idx;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	output = &line->output;
+	if (output->state != VFE_OUTPUT_OFF) {
+		dev_err(vfe->camss->dev, "Output is running\n");
+		goto error;
+	}
+	output->state = VFE_OUTPUT_RESERVED;
+
+	output->gen1.active_buf = 0;
+
+	switch (f->fmt.pix_mp.pixelformat) {
+	case V4L2_PIX_FMT_NV12:
+	case V4L2_PIX_FMT_NV21:
+	case V4L2_PIX_FMT_NV16:
+	case V4L2_PIX_FMT_NV61:
+		output->wm_num = 2;
+		break;
+	default:
+		output->wm_num = 1;
+		break;
+	}
+
+	for (i = 0; i < output->wm_num; i++) {
+		wm_idx = vfe_reserve_wm(vfe, line->id);
+		if (wm_idx < 0) {
+			dev_err(vfe->camss->dev, "Can not reserve wm\n");
+			goto error_get_wm;
+		}
+		output->wm_idx[i] = wm_idx;
+	}
+
+	output->drop_update_idx = 0;
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+
+error_get_wm:
+	for (i--; i >= 0; i--)
+		vfe_release_wm(vfe, output->wm_idx[i]);
+	output->state = VFE_OUTPUT_OFF;
+error:
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return -EINVAL;
+}
+
+int vfe_gen1_enable(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	int ret;
+
+	mutex_lock(&vfe->stream_lock);
+
+	if (!vfe->stream_count) {
+		vfe->ops_gen1->enable_irq_common(vfe);
+		vfe->ops_gen1->bus_enable_wr_if(vfe, 1);
+		vfe->ops_gen1->set_qos(vfe);
+		vfe->ops_gen1->set_ds(vfe);
+	}
+
+	vfe->stream_count++;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	ret = vfe_get_output(line);
+	if (ret < 0)
+		goto error_get_output;
+
+	ret = vfe_enable_output(line);
+	if (ret < 0)
+		goto error_enable_output;
+
+	vfe->was_streaming = 1;
+
+	return 0;
+
+
+error_enable_output:
+	vfe_put_output(line);
+
+error_get_output:
+	mutex_lock(&vfe->stream_lock);
+
+	if (vfe->stream_count == 1)
+		vfe->ops_gen1->bus_enable_wr_if(vfe, 0);
+
+	vfe->stream_count--;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	return ret;
+}
+
+static void vfe_output_update_ping_addr(struct vfe_device *vfe,
+					struct vfe_output *output, u8 sync,
+					struct vfe_line *line)
+{
+	u32 addr;
+	unsigned int i;
+
+	for (i = 0; i < output->wm_num; i++) {
+		if (output->buf[0])
+			addr = output->buf[0]->addr[i];
+		else
+			addr = 0;
+
+		vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], addr);
+		if (sync)
+			vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+	}
+}
+
+static void vfe_output_update_pong_addr(struct vfe_device *vfe,
+					struct vfe_output *output, u8 sync,
+					struct vfe_line *line)
+{
+	u32 addr;
+	unsigned int i;
+
+	for (i = 0; i < output->wm_num; i++) {
+		if (output->buf[1])
+			addr = output->buf[1]->addr[i];
+		else
+			addr = 0;
+
+		vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], addr);
+		if (sync)
+			vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+
+	}
+
+}
+
+static void vfe_buf_update_wm_on_next(struct vfe_device *vfe,
+				      struct vfe_output *output)
+{
+	switch (output->state) {
+	case VFE_OUTPUT_CONTINUOUS:
+		vfe_output_frame_drop(vfe, output, 3);
+		break;
+	case VFE_OUTPUT_SINGLE:
+	default:
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Next buf in wrong state! %d\n",
+				    output->state);
+		break;
+	}
+}
+
+static void vfe_buf_update_wm_on_last(struct vfe_device *vfe,
+				      struct vfe_output *output)
+{
+	switch (output->state) {
+	case VFE_OUTPUT_CONTINUOUS:
+		output->state = VFE_OUTPUT_SINGLE;
+		vfe_output_frame_drop(vfe, output, 1);
+		break;
+	case VFE_OUTPUT_SINGLE:
+		output->state = VFE_OUTPUT_STOPPING;
+		vfe_output_frame_drop(vfe, output, 0);
+		break;
+	default:
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Last buff in wrong state! %d\n",
+				    output->state);
+		break;
+	}
+}
+
+static void vfe_buf_update_wm_on_new(struct vfe_device *vfe,
+				     struct vfe_output *output,
+				     struct camss_buffer *new_buf,
+				     struct vfe_line *line)
+{
+	int inactive_idx;
+
+	switch (output->state) {
+	case VFE_OUTPUT_SINGLE:
+		inactive_idx = !output->gen1.active_buf;
+
+		if (!output->buf[inactive_idx]) {
+			output->buf[inactive_idx] = new_buf;
+
+			if (inactive_idx)
+				vfe_output_update_pong_addr(vfe, output, 0, line);
+			else
+				vfe_output_update_ping_addr(vfe, output, 0, line);
+
+			vfe_output_frame_drop(vfe, output, 3);
+			output->state = VFE_OUTPUT_CONTINUOUS;
+		} else {
+			vfe_buf_add_pending(output, new_buf);
+			dev_err_ratelimited(vfe->camss->dev,
+					    "Inactive buffer is busy\n");
+		}
+		break;
+
+	case VFE_OUTPUT_IDLE:
+		if (!output->buf[0]) {
+			output->buf[0] = new_buf;
+
+			vfe_output_init_addrs(vfe, output, 1, line);
+			vfe_output_frame_drop(vfe, output, 1);
+
+			output->state = VFE_OUTPUT_SINGLE;
+		} else {
+			vfe_buf_add_pending(output, new_buf);
+			dev_err_ratelimited(vfe->camss->dev,
+					    "Output idle with buffer set!\n");
+		}
+		break;

drivers/media/platform/qcom/camss/camss-vfe-gen1.c line 515

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +10 -0
+
+	case VFE_OUTPUT_CONTINUOUS:
+	default:
+		vfe_buf_add_pending(output, new_buf);
+		break;
+	}
+}
+
+/*
+ * vfe_isr_halt_ack - Process start of frame interrupt

- nitpick: wrong description of the function

Quoted 1,567 lines
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +248 -0
+ * @vfe: VFE Device
+ */
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+	complete(&vfe->halt_complete);
+	vfe->ops_gen1->halt_clear(vfe);
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+	struct vfe_output *output;
+	unsigned long flags;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+	output = &vfe->line[line_id].output;
+	if (output->gen1.wait_sof) {
+		output->gen1.wait_sof = 0;
+		complete(&output->sof);
+	}
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+	struct vfe_output *output;
+	struct vfe_line *line = &vfe->line[line_id];
+	unsigned long flags;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+	vfe->ops->reg_update_clear(vfe, line_id);
+
+	output = &line->output;
+
+	if (output->wait_reg_update) {
+		output->wait_reg_update = 0;
+		complete(&output->reg_update);
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+		return;
+	}
+
+	if (output->state == VFE_OUTPUT_STOPPING) {
+		/* Release last buffer when hw is idle */
+		if (output->last_buffer) {
+			vb2_buffer_done(&output->last_buffer->vb.vb2_buf,
+					VB2_BUF_STATE_DONE);
+			output->last_buffer = NULL;
+		}
+		output->state = VFE_OUTPUT_IDLE;
+
+		/* Buffers received in stopping state are queued in */
+		/* dma pending queue, start next capture here */
+
+		output->buf[0] = vfe_buf_get_pending(output);
+		output->buf[1] = vfe_buf_get_pending(output);
+
+		if (!output->buf[0] && output->buf[1]) {
+			output->buf[0] = output->buf[1];
+			output->buf[1] = NULL;
+		}
+
+		if (output->buf[0])
+			output->state = VFE_OUTPUT_SINGLE;
+
+		if (output->buf[1])
+			output->state = VFE_OUTPUT_CONTINUOUS;
+
+		switch (output->state) {
+		case VFE_OUTPUT_SINGLE:
+			vfe_output_frame_drop(vfe, output, 2);
+			break;
+		case VFE_OUTPUT_CONTINUOUS:
+			vfe_output_frame_drop(vfe, output, 3);
+			break;
+		default:
+			vfe_output_frame_drop(vfe, output, 0);
+			break;
+		}
+
+		vfe_output_init_addrs(vfe, output, 1, &vfe->line[line_id]);
+	}
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+	struct camss_buffer *ready_buf;
+	struct vfe_output *output;
+	dma_addr_t *new_addr;
+	unsigned long flags;
+	u32 active_index;
+	u64 ts = ktime_get_ns();
+	unsigned int i;
+
+	active_index = vfe->ops_gen1->wm_get_ping_pong_status(vfe, wm);
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Received wm done for unmapped index\n");
+		goto out_unlock;
+	}
+	output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+	if (output->gen1.active_buf == active_index && 0) {
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Active buffer mismatch!\n");
+		goto out_unlock;
+	}
+	output->gen1.active_buf = active_index;
+
+	ready_buf = output->buf[!active_index];
+	if (!ready_buf) {
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Missing ready buf %d %d!\n",
+				    !active_index, output->state);
+		goto out_unlock;
+	}
+
+	ready_buf->vb.vb2_buf.timestamp = ts;
+	ready_buf->vb.sequence = output->sequence++;
+
+	/* Get next buffer */
+	output->buf[!active_index] = vfe_buf_get_pending(output);
+	if (!output->buf[!active_index]) {
+		/* No next buffer - set same address */
+		new_addr = ready_buf->addr;
+		vfe_buf_update_wm_on_last(vfe, output);
+	} else {
+		new_addr = output->buf[!active_index]->addr;
+		vfe_buf_update_wm_on_next(vfe, output);
+	}
+
+	if (active_index)
+		for (i = 0; i < output->wm_num; i++)
+			vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], new_addr[i]);
+	else
+		for (i = 0; i < output->wm_num; i++)
+			vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], new_addr[i]);
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	if (output->state == VFE_OUTPUT_STOPPING)
+		output->last_buffer = ready_buf;
+	else
+		vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+	return;
+
+out_unlock:
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid, struct camss_buffer *buf)
+{
+	struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output;
+	unsigned long flags;
+
+	output = &line->output;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	vfe_buf_update_wm_on_new(vfe, output, buf, line);
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+}
+
+inline u8 vfe_calc_interp_reso(u16 input, u16 output)
+{
+	if (input / output >= 16)
+		return 0;
+
+	if (input / output >= 8)
+		return 1;
+
+	if (input / output >= 4)
+		return 2;
+
+	return 3;
+}
+
+#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
+
+int vfe_word_per_line(u32 format, u32 width)
+{
+	int val = 0;
+
+	switch (format) {
+	case V4L2_PIX_FMT_NV12:
+	case V4L2_PIX_FMT_NV21:
+	case V4L2_PIX_FMT_NV16:
+	case V4L2_PIX_FMT_NV61:
+		val = CALC_WORD(width, 1, 8);
+		break;
+	case V4L2_PIX_FMT_YUYV:
+	case V4L2_PIX_FMT_YVYU:
+	case V4L2_PIX_FMT_UYVY:
+	case V4L2_PIX_FMT_VYUY:
+		val = CALC_WORD(width, 2, 8);
+		break;
+	}
+
+	return val;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_gen1 = {
+	.reset_ack = vfe_isr_reset_ack,
+	.halt_ack = vfe_isr_halt_ack,
+	.reg_update = vfe_isr_reg_update,
+	.sof = vfe_isr_sof,
+	.comp_done = vfe_isr_comp_done,
+	.wm_done = vfe_isr_wm_done,
+};
+
+const struct camss_video_ops vfe_video_ops_gen1 = {
+	.queue_buffer = vfe_queue_buffer,
+	.flush_buffers = vfe_flush_buffers,
+};
drivers/media/platform/qcom/camss/camss-vfe-gen1.h new file +110 -0
new file mode 100644
index 000000000000..42e8a3333034
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * camss-vfe.h
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.
+ */
+#ifndef QC_MSM_CAMSS_VFE_GEN1_H
+#define QC_MSM_CAMSS_VFE_GEN1_H
+
+
+#include "camss-vfe.h"
+
+
+enum vfe_line_id;
+struct vfe_device;
+struct vfe_line;
+struct vfe_output;
+
+struct vfe_hw_ops_gen1 {
+	void (*bus_connect_wm_to_rdi)(struct vfe_device *vfe, u8 wm, enum vfe_line_id id);
+	void (*bus_disconnect_wm_from_rdi)(struct vfe_device *vfe, u8 wm, enum vfe_line_id id);
+	void (*bus_enable_wr_if)(struct vfe_device *vfe, u8 enable);
+	void (*bus_reload_wm)(struct vfe_device *vfe, u8 wm);
+	int (*camif_wait_for_stop)(struct vfe_device *vfe, struct device *dev);
+	void (*enable_irq_common)(struct vfe_device *vfe);
+	void (*enable_irq_wm_line)(struct vfe_device *vfe, u8 wm, enum vfe_line_id line_id,
+				   u8 enable);
+	void (*enable_irq_pix_line)(struct vfe_device *vfe, u8 comp, enum vfe_line_id line_id,
+				    u8 enable);
+	u16 (*get_ub_size)(u8 vfe_id);
+	void (*halt_clear)(struct vfe_device *vfe);
+	void (*halt_request)(struct vfe_device *vfe);
+	void (*set_camif_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+	void (*set_camif_cmd)(struct vfe_device *vfe, u8 enable);
+	void (*set_cgc_override)(struct vfe_device *vfe, u8 wm, u8 enable);
+	void (*set_clamp_cfg)(struct vfe_device *vfe);
+	void (*set_crop_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+	void (*set_demux_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+	void (*set_ds)(struct vfe_device *vfe);
+	void (*set_module_cfg)(struct vfe_device *vfe, u8 enable);
+	void (*set_scale_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+	void (*set_rdi_cid)(struct vfe_device *vfe, enum vfe_line_id id, u8 cid);
+	void (*set_realign_cfg)(struct vfe_device *vfe, struct vfe_line *line, u8 enable);
+	void (*set_qos)(struct vfe_device *vfe);
+	void (*set_xbar_cfg)(struct vfe_device *vfe, struct vfe_output *output, u8 enable);
+	void (*wm_frame_based)(struct vfe_device *vfe, u8 wm, u8 enable);
+	void (*wm_line_based)(struct vfe_device *vfe, u32 wm, struct v4l2_pix_format_mplane *pix,
+			      u8 plane, u32 enable);
+	void (*wm_set_ub_cfg)(struct vfe_device *vfe, u8 wm, u16 offset, u16 depth);
+	void (*wm_set_subsample)(struct vfe_device *vfe, u8 wm);
+	void (*wm_set_framedrop_period)(struct vfe_device *vfe, u8 wm, u8 per);
+	void (*wm_set_framedrop_pattern)(struct vfe_device *vfe, u8 wm, u32 pattern);
+	void (*wm_set_ping_addr)(struct vfe_device *vfe, u8 wm, u32 addr);
+	void (*wm_set_pong_addr)(struct vfe_device *vfe, u8 wm, u32 addr);
+	int (*wm_get_ping_pong_status)(struct vfe_device *vfe, u8 wm);
+	void (*wm_enable)(struct vfe_device *vfe, u8 wm, u8 enable);
+};
+
+/*
+ * vfe_calc_interp_reso - Calculate interpolation mode
+ * @input: Input resolution
+ * @output: Output resolution
+ *
+ * Return interpolation mode
+ */
+inline u8 vfe_calc_interp_reso(u16 input, u16 output);
+
+/*
+ * vfe_gen1_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_gen1_disable(struct vfe_line *line);
+
+
+/*
+ * vfe_gen1_enable - Enable VFE module
+ * @line: VFE line
+ *
+ * Return 0 on success
+ */
+int vfe_gen1_enable(struct vfe_line *line);
+
+/*
+ * vfe_gen1_enable - Halt VFE module
+ * @vfe: VFE device
+ *
+ * Return 0 on success
+ */
+int vfe_gen1_halt(struct vfe_device *vfe);
+
+/*
+ * vfe_word_per_line - Calculate number of words per frame width
+ * @format: V4L2 format
+ * @width: Frame width
+ *
+ * Return number of words per frame width
+ */
+int vfe_word_per_line(u32 format, u32 width);
+
+
+extern const struct vfe_isr_ops vfe_isr_ops_gen1;
+extern const struct camss_video_ops vfe_video_ops_gen1;
+
+
+#endif /* QC_MSM_CAMSS_VFE_GEN1_H */
drivers/media/platform/qcom/camss/camss-vfe.c +26 -764
index 94c9ca7d5cbb..375843bd16af 100644
@@ -26,22 +26,8 @@
 
  #define MSM_VFE_NAME "msm_vfe"
 
-#define vfe_line_array(ptr_line)	\
-	((const struct vfe_line (*)[]) &(ptr_line[-(ptr_line->id)]))
-
-#define to_vfe(ptr_line)	\
-	container_of(vfe_line_array(ptr_line), struct vfe_device, line)
-
  /* VFE reset timeout */
  #define VFE_RESET_TIMEOUT_MS 50
-/* VFE halt timeout */
-#define VFE_HALT_TIMEOUT_MS 100
-/* Max number of frame drop updates per frame */
-#define VFE_FRAME_DROP_UPDATES 2
-/* Frame drop value. VAL + UPDATES - 1 should not exceed 31 */
-#define VFE_FRAME_DROP_VAL 30
-
-#define VFE_NEXT_SOF_MS 500
 
  #define SCALER_RATIO_MAX 16
 
@@ -294,35 +280,11 @@ static int vfe_reset(struct vfe_device *vfe)
  	return 0;
  }
 
-/*
- * vfe_halt - Trigger halt on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_halt(struct vfe_device *vfe)
-{
-	unsigned long time;
-
-	reinit_completion(&vfe->halt_complete);
-
-	vfe->ops->halt_request(vfe);
-
-	time = wait_for_completion_timeout(&vfe->halt_complete,
-		msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
-	if (!time) {
-		dev_err(vfe->camss->dev, "VFE halt timeout\n");
-		return -EIO;
-	}
-
-	return 0;
-}
-
  static void vfe_init_outputs(struct vfe_device *vfe)
  {
  	int i;
 
-	for (i = 0; i < ARRAY_SIZE(vfe->line); i++) {
+	for (i = 0; i < vfe->line_num; i++) {
  		struct vfe_output *output = &vfe->line[i].output;
 
  		output->state = VFE_OUTPUT_OFF;
@@ -340,71 +302,7 @@ static void vfe_reset_output_maps(struct vfe_device *vfe)
  		vfe->wm_output_map[i] = VFE_LINE_NONE;
  }
 
-static void vfe_output_init_addrs(struct vfe_device *vfe,
-				  struct vfe_output *output, u8 sync)
-{
-	u32 ping_addr;
-	u32 pong_addr;
-	unsigned int i;
-
-	output->active_buf = 0;
-
-	for (i = 0; i < output->wm_num; i++) {
-		if (output->buf[0])
-			ping_addr = output->buf[0]->addr[i];
-		else
-			ping_addr = 0;
-
-		if (output->buf[1])
-			pong_addr = output->buf[1]->addr[i];
-		else
-			pong_addr = ping_addr;
-
-		vfe->ops->wm_set_ping_addr(vfe, output->wm_idx[i], ping_addr);
-		vfe->ops->wm_set_pong_addr(vfe, output->wm_idx[i], pong_addr);
-		if (sync)
-			vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-	}
-}
-
-static void vfe_output_update_ping_addr(struct vfe_device *vfe,
-					struct vfe_output *output, u8 sync)
-{
-	u32 addr;
-	unsigned int i;
-
-	for (i = 0; i < output->wm_num; i++) {
-		if (output->buf[0])
-			addr = output->buf[0]->addr[i];
-		else
-			addr = 0;
-
-		vfe->ops->wm_set_ping_addr(vfe, output->wm_idx[i], addr);
-		if (sync)
-			vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-	}
-}
-
-static void vfe_output_update_pong_addr(struct vfe_device *vfe,
-					struct vfe_output *output, u8 sync)
-{
-	u32 addr;
-	unsigned int i;
-
-	for (i = 0; i < output->wm_num; i++) {
-		if (output->buf[1])
-			addr = output->buf[1]->addr[i];
-		else
-			addr = 0;
-
-		vfe->ops->wm_set_pong_addr(vfe, output->wm_idx[i], addr);
-		if (sync)
-			vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-	}
-
-}
-
-static int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
+int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
  {
  	int ret = -EBUSY;
  	int i;
@@ -420,7 +318,7 @@ static int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
  	return ret;
  }
 
-static int vfe_release_wm(struct vfe_device *vfe, u8 wm)
+int vfe_release_wm(struct vfe_device *vfe, u8 wm)
  {
  	if (wm >= ARRAY_SIZE(vfe->wm_output_map))
  		return -EINVAL;
@@ -430,29 +328,7 @@ static int vfe_release_wm(struct vfe_device *vfe, u8 wm)
  	return 0;
  }
 
-static void vfe_output_frame_drop(struct vfe_device *vfe,
-				  struct vfe_output *output,
-				  u32 drop_pattern)
-{
-	u8 drop_period;
-	unsigned int i;
-
-	/* We need to toggle update period to be valid on next frame */
-	output->drop_update_idx++;
-	output->drop_update_idx %= VFE_FRAME_DROP_UPDATES;
-	drop_period = VFE_FRAME_DROP_VAL + output->drop_update_idx;
-
-	for (i = 0; i < output->wm_num; i++) {
-		vfe->ops->wm_set_framedrop_period(vfe, output->wm_idx[i],
-						  drop_period);
-		vfe->ops->wm_set_framedrop_pattern(vfe, output->wm_idx[i],
-						   drop_pattern);
-	}
-	vfe->ops->reg_update(vfe,
-			     container_of(output, struct vfe_line, output)->id);
-}
-
-static struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
+struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
  {
  	struct camss_buffer *buffer = NULL;
 
@@ -466,13 +342,8 @@ static struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
  	return buffer;
  }
 
-/*
- * vfe_buf_add_pending - Add output buffer to list of pending
- * @output: VFE output
- * @buffer: Video buffer
- */
-static void vfe_buf_add_pending(struct vfe_output *output,
-				struct camss_buffer *buffer)
+void vfe_buf_add_pending(struct vfe_output *output,
+			 struct camss_buffer *buffer)
  {
  	INIT_LIST_HEAD(&buffer->queue);
  	list_add_tail(&buffer->queue, &output->pending_bufs);
@@ -495,149 +366,7 @@ static void vfe_buf_flush_pending(struct vfe_output *output,
  	}
  }
 
-static void vfe_buf_update_wm_on_next(struct vfe_device *vfe,
-				      struct vfe_output *output)
-{
-	switch (output->state) {
-	case VFE_OUTPUT_CONTINUOUS:
-		vfe_output_frame_drop(vfe, output, 3);
-		break;
-	case VFE_OUTPUT_SINGLE:
-	default:
-		dev_err_ratelimited(vfe->camss->dev,
-				    "Next buf in wrong state! %d\n",
-				    output->state);
-		break;
-	}
-}
-
-static void vfe_buf_update_wm_on_last(struct vfe_device *vfe,
-				      struct vfe_output *output)
-{
-	switch (output->state) {
-	case VFE_OUTPUT_CONTINUOUS:
-		output->state = VFE_OUTPUT_SINGLE;
-		vfe_output_frame_drop(vfe, output, 1);
-		break;
-	case VFE_OUTPUT_SINGLE:
-		output->state = VFE_OUTPUT_STOPPING;
-		vfe_output_frame_drop(vfe, output, 0);
-		break;
-	default:
-		dev_err_ratelimited(vfe->camss->dev,
-				    "Last buff in wrong state! %d\n",
-				    output->state);
-		break;
-	}
-}
-
-static void vfe_buf_update_wm_on_new(struct vfe_device *vfe,
-				     struct vfe_output *output,
-				     struct camss_buffer *new_buf)
-{
-	int inactive_idx;
-
-	switch (output->state) {
-	case VFE_OUTPUT_SINGLE:
-		inactive_idx = !output->active_buf;
-
-		if (!output->buf[inactive_idx]) {
-			output->buf[inactive_idx] = new_buf;
-
-			if (inactive_idx)
-				vfe_output_update_pong_addr(vfe, output, 0);
-			else
-				vfe_output_update_ping_addr(vfe, output, 0);
-
-			vfe_output_frame_drop(vfe, output, 3);
-			output->state = VFE_OUTPUT_CONTINUOUS;
-		} else {
-			vfe_buf_add_pending(output, new_buf);
-			dev_err_ratelimited(vfe->camss->dev,
-					    "Inactive buffer is busy\n");
-		}
-		break;
-
-	case VFE_OUTPUT_IDLE:
-		if (!output->buf[0]) {
-			output->buf[0] = new_buf;
-
-			vfe_output_init_addrs(vfe, output, 1);
-
-			vfe_output_frame_drop(vfe, output, 1);
-			output->state = VFE_OUTPUT_SINGLE;
-		} else {
-			vfe_buf_add_pending(output, new_buf);
-			dev_err_ratelimited(vfe->camss->dev,
-					    "Output idle with buffer set!\n");
-		}
-		break;
-
-	case VFE_OUTPUT_CONTINUOUS:
-	default:
-		vfe_buf_add_pending(output, new_buf);
-		break;
-	}
-}
-
-static int vfe_get_output(struct vfe_line *line)
-{
-	struct vfe_device *vfe = to_vfe(line);
-	struct vfe_output *output;
-	struct v4l2_format *f = &line->video_out.active_fmt;
-	unsigned long flags;
-	int i;
-	int wm_idx;
-
-	spin_lock_irqsave(&vfe->output_lock, flags);
-
-	output = &line->output;
-	if (output->state != VFE_OUTPUT_OFF) {
-		dev_err(vfe->camss->dev, "Output is running\n");
-		goto error;
-	}
-	output->state = VFE_OUTPUT_RESERVED;
-
-	output->active_buf = 0;
-
-	switch (f->fmt.pix_mp.pixelformat) {
-	case V4L2_PIX_FMT_NV12:
-	case V4L2_PIX_FMT_NV21:
-	case V4L2_PIX_FMT_NV16:
-	case V4L2_PIX_FMT_NV61:
-		output->wm_num = 2;
-		break;
-	default:
-		output->wm_num = 1;
-		break;
-	}
-
-	for (i = 0; i < output->wm_num; i++) {
-		wm_idx = vfe_reserve_wm(vfe, line->id);
-		if (wm_idx < 0) {
-			dev_err(vfe->camss->dev, "Can not reserve wm\n");
-			goto error_get_wm;
-		}
-		output->wm_idx[i] = wm_idx;
-	}
-
-	output->drop_update_idx = 0;
-
-	spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-	return 0;
-
-error_get_wm:
-	for (i--; i >= 0; i--)
-		vfe_release_wm(vfe, output->wm_idx[i]);
-	output->state = VFE_OUTPUT_OFF;
-error:
-	spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-	return -EINVAL;
-}
-
-static int vfe_put_output(struct vfe_line *line)
+int vfe_put_output(struct vfe_line *line)
  {
  	struct vfe_device *vfe = to_vfe(line);
  	struct vfe_output *output = &line->output;
@@ -655,454 +384,27 @@ static int vfe_put_output(struct vfe_line *line)
  	return 0;
  }
 
-static int vfe_enable_output(struct vfe_line *line)
-{
-	struct vfe_device *vfe = to_vfe(line);
-	struct vfe_output *output = &line->output;
-	const struct vfe_hw_ops *ops = vfe->ops;
-	struct media_entity *sensor;
-	unsigned long flags;
-	unsigned int frame_skip = 0;
-	unsigned int i;
-	u16 ub_size;
-
-	ub_size = ops->get_ub_size(vfe->id);
-	if (!ub_size)
-		return -EINVAL;
-
-	sensor = camss_find_sensor(&line->subdev.entity);
-	if (sensor) {
-		struct v4l2_subdev *subdev =
-					media_entity_to_v4l2_subdev(sensor);
-
-		v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
-		/* Max frame skip is 29 frames */
-		if (frame_skip > VFE_FRAME_DROP_VAL - 1)
-			frame_skip = VFE_FRAME_DROP_VAL - 1;
-	}
-
-	spin_lock_irqsave(&vfe->output_lock, flags);
-
-	ops->reg_update_clear(vfe, line->id);
-
-	if (output->state != VFE_OUTPUT_RESERVED) {
-		dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
-			output->state);
-		spin_unlock_irqrestore(&vfe->output_lock, flags);
-		return -EINVAL;
-	}
-	output->state = VFE_OUTPUT_IDLE;
-
-	output->buf[0] = vfe_buf_get_pending(output);
-	output->buf[1] = vfe_buf_get_pending(output);
-
-	if (!output->buf[0] && output->buf[1]) {
-		output->buf[0] = output->buf[1];
-		output->buf[1] = NULL;
-	}
-
-	if (output->buf[0])
-		output->state = VFE_OUTPUT_SINGLE;
-
-	if (output->buf[1])
-		output->state = VFE_OUTPUT_CONTINUOUS;
-
-	switch (output->state) {
-	case VFE_OUTPUT_SINGLE:
-		vfe_output_frame_drop(vfe, output, 1 << frame_skip);
-		break;
-	case VFE_OUTPUT_CONTINUOUS:
-		vfe_output_frame_drop(vfe, output, 3 << frame_skip);
-		break;
-	default:
-		vfe_output_frame_drop(vfe, output, 0);
-		break;
-	}
-
-	output->sequence = 0;
-	output->wait_sof = 0;
-	output->wait_reg_update = 0;
-	reinit_completion(&output->sof);
-	reinit_completion(&output->reg_update);
-
-	vfe_output_init_addrs(vfe, output, 0);
-
-	if (line->id != VFE_LINE_PIX) {
-		ops->set_cgc_override(vfe, output->wm_idx[0], 1);
-		ops->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 1);
-		ops->bus_connect_wm_to_rdi(vfe, output->wm_idx[0], line->id);
-		ops->wm_set_subsample(vfe, output->wm_idx[0]);
-		ops->set_rdi_cid(vfe, line->id, 0);
-		ops->wm_set_ub_cfg(vfe, output->wm_idx[0],
-				   (ub_size + 1) * output->wm_idx[0], ub_size);
-		ops->wm_frame_based(vfe, output->wm_idx[0], 1);
-		ops->wm_enable(vfe, output->wm_idx[0], 1);
-		ops->bus_reload_wm(vfe, output->wm_idx[0]);
-	} else {
-		ub_size /= output->wm_num;
-		for (i = 0; i < output->wm_num; i++) {
-			ops->set_cgc_override(vfe, output->wm_idx[i], 1);
-			ops->wm_set_subsample(vfe, output->wm_idx[i]);
-			ops->wm_set_ub_cfg(vfe, output->wm_idx[i],
-					   (ub_size + 1) * output->wm_idx[i],
-					   ub_size);
-			ops->wm_line_based(vfe, output->wm_idx[i],
-					&line->video_out.active_fmt.fmt.pix_mp,
-					i, 1);
-			ops->wm_enable(vfe, output->wm_idx[i], 1);
-			ops->bus_reload_wm(vfe, output->wm_idx[i]);
-		}
-		ops->enable_irq_pix_line(vfe, 0, line->id, 1);
-		ops->set_module_cfg(vfe, 1);
-		ops->set_camif_cfg(vfe, line);
-		ops->set_realign_cfg(vfe, line, 1);
-		ops->set_xbar_cfg(vfe, output, 1);
-		ops->set_demux_cfg(vfe, line);
-		ops->set_scale_cfg(vfe, line);
-		ops->set_crop_cfg(vfe, line);
-		ops->set_clamp_cfg(vfe);
-		ops->set_camif_cmd(vfe, 1);
-	}
-
-	ops->reg_update(vfe, line->id);
-
-	spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-	return 0;
-}
-
-static int vfe_disable_output(struct vfe_line *line)
-{
-	struct vfe_device *vfe = to_vfe(line);
-	struct vfe_output *output = &line->output;
-	const struct vfe_hw_ops *ops = vfe->ops;
-	unsigned long flags;
-	unsigned long time;
-	unsigned int i;
-
-	spin_lock_irqsave(&vfe->output_lock, flags);
-
-	output->wait_sof = 1;
-	spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-	time = wait_for_completion_timeout(&output->sof,
-					   msecs_to_jiffies(VFE_NEXT_SOF_MS));
-	if (!time)
-		dev_err(vfe->camss->dev, "VFE sof timeout\n");
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/camss/camss-vfe.h +68 -53
index 5bce6736e4bb..aad5dc74c2c0 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/camss/camss.c +2 -2
index 5ac2dfc67c8b..6c6f1e59ccd8 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#13 lore raw

Re: [PATCH v5 06/22] media: camss: Refactor VFE HW version support

Quoted 1,581 lines · Andrey Konovalov

Hi Robert,

Thank you for your patch!

Just two minor comments below.

Quoted 1,561 lines · Robert Foss

In order to support Qualcomm ISP hardware architectures that diverge from older architectures, the VFE subdevice driver needs to be refactored to better abstract the different ISP architectures.

Gen1 represents the CAMSS ISP architecture. The ISP architecture developed after CAMSS, Titan, will be referred to as Gen2.

---

Changes since v1
- kernel test robot: Re-add chunk missing from vfe_output_update_pong_addr
- Andrey: Fix file name error
- Andrey: Change hardware version number in comment
- Changed copyright year to 2021 for camss-vfe-4-8.c

Changes since v3:
- Nicolas: Replace trace_printk() with dev_dbg()
- Removed spurious whitespace

Changes since v4:
- Andrey: Refactor to make PIX support optional

  drivers/media/platform/qcom/camss/Makefile    |    2 +
  .../media/platform/qcom/camss/camss-vfe-4-1.c |  118 +-
  .../media/platform/qcom/camss/camss-vfe-4-7.c |  239 ++--
  .../media/platform/qcom/camss/camss-vfe-4-8.c | 1166 +++++++++++++++++
  .../platform/qcom/camss/camss-vfe-gen1.c      |  763 +++++++++++
  .../platform/qcom/camss/camss-vfe-gen1.h      |  110 ++
  drivers/media/platform/qcom/camss/camss-vfe.c |  790 +----------
  drivers/media/platform/qcom/camss/camss-vfe.h |  121 +-
  drivers/media/platform/qcom/camss/camss.c     |    4 +-
  9 files changed, 2263 insertions(+), 1050 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-4-8.c create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.c create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-gen1.h

drivers/media/platform/qcom/camss/Makefile +2 -0
index 63c1b1b2943c..940c0ae3e003 100644
@@ -10,6 +10,8 @@ qcom-camss-objs += \
              camss-ispif.o \
              camss-vfe-4-1.o \
              camss-vfe-4-7.o \
+             camss-vfe-4-8.o \
+             camss-vfe-gen1.o \
              camss-vfe.o \
              camss-video.o \
 
drivers/media/platform/qcom/camss/camss-vfe-4-1.c +49 -69
index 85b9bcbc7321..81756d7fd5c2 100644
@@ -14,6 +14,7 @@
 
  #include "camss.h"
  #include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
 
  #define VFE_0_HW_VERSION            0x000
 
@@ -284,30 +285,6 @@ static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
                      1 << VFE_0_BUS_IMAGE_MASTER_n_WR_CFG_FRM_BASED_SHIFT);
  }
 
-#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
-
-static int vfe_word_per_line(u32 format, u32 pixel_per_line)
-{
-     int val = 0;
-
-     switch (format) {
-     case V4L2_PIX_FMT_NV12:
-     case V4L2_PIX_FMT_NV21:
-     case V4L2_PIX_FMT_NV16:
-     case V4L2_PIX_FMT_NV61:
-             val = CALC_WORD(pixel_per_line, 1, 8);
-             break;
-     case V4L2_PIX_FMT_YUYV:
-     case V4L2_PIX_FMT_YVYU:
-     case V4L2_PIX_FMT_UYVY:
-     case V4L2_PIX_FMT_VYUY:
-             val = CALC_WORD(pixel_per_line, 2, 8);
-             break;
-     }
-
-     return val;
-}
-
  static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
                           u16 *width, u16 *height, u16 *bytesperline)
  {
@@ -666,20 +643,6 @@ static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
      writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
  }
 
-static inline u8 vfe_calc_interp_reso(u16 input, u16 output)
-{
-     if (input / output >= 16)
-             return 0;
-
-     if (input / output >= 8)
-             return 1;
-
-     if (input / output >= 4)
-             return 2;
-
-     return 3;
-}
-
  static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
  {
      u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
@@ -975,46 +938,63 @@ static irqreturn_t vfe_isr(int irq, void *dev)
      return IRQ_HANDLED;
  }
 
-const struct vfe_hw_ops vfe_ops_4_1 = {
-     .hw_version_read = vfe_hw_version_read,
+
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_1 = {
+     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+     .bus_enable_wr_if = vfe_bus_enable_wr_if,
+     .bus_reload_wm = vfe_bus_reload_wm,
+     .camif_wait_for_stop = vfe_camif_wait_for_stop,
+     .enable_irq_common = vfe_enable_irq_common,
+     .enable_irq_pix_line = vfe_enable_irq_pix_line,
+     .enable_irq_wm_line = vfe_enable_irq_wm_line,
      .get_ub_size = vfe_get_ub_size,
-     .global_reset = vfe_global_reset,
-     .halt_request = vfe_halt_request,
      .halt_clear = vfe_halt_clear,
+     .halt_request = vfe_halt_request,
+     .set_camif_cfg = vfe_set_camif_cfg,
+     .set_camif_cmd = vfe_set_camif_cmd,
+     .set_cgc_override = vfe_set_cgc_override,
+     .set_clamp_cfg = vfe_set_clamp_cfg,
+     .set_crop_cfg = vfe_set_crop_cfg,
+     .set_demux_cfg = vfe_set_demux_cfg,
+     .set_ds = vfe_set_ds,
+     .set_module_cfg = vfe_set_module_cfg,
+     .set_qos = vfe_set_qos,
+     .set_rdi_cid = vfe_set_rdi_cid,
+     .set_realign_cfg = vfe_set_realign_cfg,
+     .set_scale_cfg = vfe_set_scale_cfg,
+     .set_xbar_cfg = vfe_set_xbar_cfg,
      .wm_enable = vfe_wm_enable,
      .wm_frame_based = vfe_wm_frame_based,
+     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
      .wm_line_based = vfe_wm_line_based,
-     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
      .wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-     .bus_reload_wm = vfe_bus_reload_wm,
+     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
      .wm_set_ping_addr = vfe_wm_set_ping_addr,
      .wm_set_pong_addr = vfe_wm_set_pong_addr,
-     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-     .bus_enable_wr_if = vfe_bus_enable_wr_if,
-     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
      .wm_set_subsample = vfe_wm_set_subsample,
-     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-     .set_xbar_cfg = vfe_set_xbar_cfg,
-     .set_realign_cfg = vfe_set_realign_cfg,
-     .set_rdi_cid = vfe_set_rdi_cid,
-     .reg_update = vfe_reg_update,
-     .reg_update_clear = vfe_reg_update_clear,
-     .enable_irq_wm_line = vfe_enable_irq_wm_line,
-     .enable_irq_pix_line = vfe_enable_irq_pix_line,
-     .enable_irq_common = vfe_enable_irq_common,
-     .set_demux_cfg = vfe_set_demux_cfg,
-     .set_scale_cfg = vfe_set_scale_cfg,
-     .set_crop_cfg = vfe_set_crop_cfg,
-     .set_clamp_cfg = vfe_set_clamp_cfg,
-     .set_qos = vfe_set_qos,
-     .set_ds = vfe_set_ds,
-     .set_cgc_override = vfe_set_cgc_override,
-     .set_camif_cfg = vfe_set_camif_cfg,
-     .set_camif_cmd = vfe_set_camif_cmd,
-     .set_module_cfg = vfe_set_module_cfg,
-     .camif_wait_for_stop = vfe_camif_wait_for_stop,
+     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_gen1;
+     vfe->ops_gen1 = &vfe_ops_gen1_4_1;
+     vfe->video_ops = vfe_video_ops_gen1;
+
+     vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_1 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
      .isr_read = vfe_isr_read,
-     .violation_read = vfe_violation_read,
      .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_gen1_disable,
+     .vfe_enable = vfe_gen1_enable,
+     .vfe_halt = vfe_gen1_halt,
+     .violation_read = vfe_violation_read,
  };
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +77 -162
index f7e00a2de393..a3f31f38dfed 100644
@@ -14,6 +14,8 @@
 
  #include "camss.h"
  #include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
 
  #define VFE_0_HW_VERSION            0x000
 
@@ -258,7 +260,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
      dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version);
  }
 
-static u16 vfe47_get_ub_size(u8 vfe_id)
+static u16 vfe_get_ub_size(u8 vfe_id)
  {
      if (vfe_id == 0)
              return MSM_VFE_VFE0_UB_SIZE_RDI;
@@ -296,6 +298,8 @@ static void vfe_global_reset(struct vfe_device *vfe)
                       VFE_0_GLOBAL_RESET_CMD_CORE;
 
      writel_relaxed(BIT(31), vfe->base + VFE_0_IRQ_MASK_0);
+
+     /* Enforce barrier between IRQ mask setup and global reset */
      wmb();
      writel_relaxed(reset_bits, vfe->base + VFE_0_GLOBAL_RESET_CMD);
  }
@@ -311,7 +315,7 @@ static void vfe_halt_clear(struct vfe_device *vfe)
      writel_relaxed(0x0, vfe->base + VFE_0_BUS_BDG_CMD);
  }
 
-static void vfe47_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
+static void vfe_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
  {
      if (enable)
              vfe_reg_set(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_CFG(wm),
@@ -460,8 +464,12 @@ static void vfe_wm_set_ub_cfg(struct vfe_device *vfe, u8 wm,
 
  static void vfe_bus_reload_wm(struct vfe_device *vfe, u8 wm)
  {
+     /* Enforce barrier between any outstanding register write */
      wmb();
+
      writel_relaxed(VFE_0_BUS_CMD_Mx_RLD_CMD(wm), vfe->base + VFE_0_BUS_CMD);
+
+     /* Use barrier to make sure bus reload is issued before anything else */
      wmb();
  }
 
@@ -675,8 +683,12 @@ static void vfe_set_rdi_cid(struct vfe_device *vfe, enum vfe_line_id id, u8 cid)
  static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
  {
      vfe->reg_update |= VFE_0_REG_UPDATE_line_n(line_id);
+
+     /* Enforce barrier between line update and commit */
      wmb();
      writel_relaxed(vfe->reg_update, vfe->base + VFE_0_REG_UPDATE);
+
+     /* Make sure register update is issued before further reg writes */
      wmb();
  }
 
@@ -780,20 +792,6 @@ static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
      writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
  }
 
-static inline u8 vfe_calc_interp_reso(u16 input, u16 output)
-{
-     if (input / output >= 16)
-             return 0;
-
-     if (input / output >= 8)
-             return 1;
-
-     if (input / output >= 4)
-             return 2;
-
-     return 3;
-}
-
  static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
  {
      u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
@@ -895,7 +893,7 @@ static void vfe_set_clamp_cfg(struct vfe_device *vfe)
      writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MIN_CFG);
  }
 
-static void vfe47_set_qos(struct vfe_device *vfe)
+static void vfe_set_qos(struct vfe_device *vfe)
  {
      u32 val = VFE_0_BUS_BDG_QOS_CFG_0_CFG;
      u32 val7 = VFE_0_BUS_BDG_QOS_CFG_7_CFG;
@@ -910,7 +908,7 @@ static void vfe47_set_qos(struct vfe_device *vfe)
      writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
  }
 
-static void vfe47_set_ds(struct vfe_device *vfe)
+static void vfe_set_ds(struct vfe_device *vfe)
  {
      u32 val = VFE_0_BUS_BDG_DS_CFG_0_CFG;
      u32 val16 = VFE_0_BUS_BDG_DS_CFG_16_CFG;
@@ -994,6 +992,8 @@ static void vfe_set_camif_cmd(struct vfe_device *vfe, u8 enable)
 
      cmd = VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS | VFE_0_CAMIF_CMD_NO_CHANGE;
      writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+
+     /* Make sure camif command is issued written before it is changed again */
      wmb();
 
      if (enable)
@@ -1036,24 +1036,7 @@ static int vfe_camif_wait_for_stop(struct vfe_device *vfe, struct device *dev)
      return ret;
  }
 
-static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
-{
-     *value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
-     *value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
 
-     writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
-     writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
-
-     wmb();
-     writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
-}
-
-static void vfe_violation_read(struct vfe_device *vfe)
-{
-     u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
-
-     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
-}
 
  /*
   * vfe_isr - VFE module interrupt handler
@@ -1108,150 +1091,82 @@ static irqreturn_t vfe_isr(int irq, void *dev)
      return IRQ_HANDLED;
  }
 
-const struct vfe_hw_ops vfe_ops_4_7 = {
-     .hw_version_read = vfe_hw_version_read,
-     .get_ub_size = vfe47_get_ub_size,
-     .global_reset = vfe_global_reset,
-     .halt_request = vfe_halt_request,
-     .halt_clear = vfe_halt_clear,
-     .wm_enable = vfe47_wm_enable,
-     .wm_frame_based = vfe_wm_frame_based,
-     .wm_line_based = vfe_wm_line_based,
-     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
-     .wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-     .bus_reload_wm = vfe_bus_reload_wm,
-     .wm_set_ping_addr = vfe_wm_set_ping_addr,
-     .wm_set_pong_addr = vfe_wm_set_pong_addr,
-     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-     .bus_enable_wr_if = vfe_bus_enable_wr_if,
-     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
-     .wm_set_subsample = vfe_wm_set_subsample,
-     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-     .set_xbar_cfg = vfe_set_xbar_cfg,
-     .set_realign_cfg = vfe_set_realign_cfg,
-     .set_rdi_cid = vfe_set_rdi_cid,
-     .reg_update = vfe_reg_update,
-     .reg_update_clear = vfe_reg_update_clear,
-     .enable_irq_wm_line = vfe_enable_irq_wm_line,
-     .enable_irq_pix_line = vfe_enable_irq_pix_line,
-     .enable_irq_common = vfe_enable_irq_common,
-     .set_demux_cfg = vfe_set_demux_cfg,
-     .set_scale_cfg = vfe_set_scale_cfg,
-     .set_crop_cfg = vfe_set_crop_cfg,
-     .set_clamp_cfg = vfe_set_clamp_cfg,
-     .set_qos = vfe47_set_qos,
-     .set_ds = vfe47_set_ds,
-     .set_cgc_override = vfe_set_cgc_override,
-     .set_camif_cfg = vfe_set_camif_cfg,
-     .set_camif_cmd = vfe_set_camif_cmd,
-     .set_module_cfg = vfe_set_module_cfg,
-     .camif_wait_for_stop = vfe_camif_wait_for_stop,
-     .isr_read = vfe_isr_read,
-     .violation_read = vfe_violation_read,
-     .isr = vfe_isr,
-};
-
-static u16 vfe48_get_ub_size(u8 vfe_id)
+static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
  {
-     /* On VFE4.8 the ub-size is the same on both instances */
-     return MSM_VFE_VFE0_UB_SIZE_RDI;
-}
+     *value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
+     *value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
 
-static void vfe48_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
-{
-     if (enable)
-             writel_relaxed(2 << VFE48_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
-                            vfe->base + VFE48_0_BUS_IMAGE_MASTER_CMD);
-     else
-             writel_relaxed(1 << VFE48_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
-                            vfe->base + VFE48_0_BUS_IMAGE_MASTER_CMD);
+     writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
+     writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
 
-     /* The WM must be enabled before sending other commands */
+     /* Enforce barrier between local & global IRQ clear */
      wmb();
+     writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
  }
 
-static void vfe48_set_qos(struct vfe_device *vfe)
-{
-     u32 val = VFE48_0_BUS_BDG_QOS_CFG_0_CFG;
-     u32 val3 = VFE48_0_BUS_BDG_QOS_CFG_3_CFG;
-     u32 val4 = VFE48_0_BUS_BDG_QOS_CFG_4_CFG;
-     u32 val7 = VFE48_0_BUS_BDG_QOS_CFG_7_CFG;
-
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_0);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_1);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_2);
-     writel_relaxed(val3, vfe->base + VFE_0_BUS_BDG_QOS_CFG_3);
-     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_4);
-     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
-     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
-     writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
-}
-
-static void vfe48_set_ds(struct vfe_device *vfe)
+static void vfe_violation_read(struct vfe_device *vfe)
  {
-     u32 val = VFE48_0_BUS_BDG_DS_CFG_0_CFG;
-     u32 val16 = VFE48_0_BUS_BDG_DS_CFG_16_CFG;
+     u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
 
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_0);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_1);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_2);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_3);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_4);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_5);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_6);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_7);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_8);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_9);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_10);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_11);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_12);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_13);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_14);
-     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_15);
-     writel_relaxed(val16, vfe->base + VFE_0_BUS_BDG_DS_CFG_16);
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
  }
 
-const struct vfe_hw_ops vfe_ops_4_8 = {
-     .hw_version_read = vfe_hw_version_read,
-     .get_ub_size = vfe48_get_ub_size,
-     .global_reset = vfe_global_reset,
-     .halt_request = vfe_halt_request,
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_7 = {
+     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+     .bus_enable_wr_if = vfe_bus_enable_wr_if,
+     .bus_reload_wm = vfe_bus_reload_wm,
+     .camif_wait_for_stop = vfe_camif_wait_for_stop,
+     .enable_irq_common = vfe_enable_irq_common,
+     .enable_irq_pix_line = vfe_enable_irq_pix_line,
+     .enable_irq_wm_line = vfe_enable_irq_wm_line,
+     .get_ub_size = vfe_get_ub_size,
      .halt_clear = vfe_halt_clear,
-     .wm_enable = vfe48_wm_enable,
+     .halt_request = vfe_halt_request,
+     .set_camif_cfg = vfe_set_camif_cfg,
+     .set_camif_cmd = vfe_set_camif_cmd,
+     .set_cgc_override = vfe_set_cgc_override,
+     .set_clamp_cfg = vfe_set_clamp_cfg,
+     .set_crop_cfg = vfe_set_crop_cfg,
+     .set_demux_cfg = vfe_set_demux_cfg,
+     .set_ds = vfe_set_ds,
+     .set_module_cfg = vfe_set_module_cfg,
+     .set_qos = vfe_set_qos,
+     .set_rdi_cid = vfe_set_rdi_cid,
+     .set_realign_cfg = vfe_set_realign_cfg,
+     .set_scale_cfg = vfe_set_scale_cfg,
+     .set_xbar_cfg = vfe_set_xbar_cfg,
+     .wm_enable = vfe_wm_enable,
      .wm_frame_based = vfe_wm_frame_based,
+     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
      .wm_line_based = vfe_wm_line_based,
-     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
      .wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
-     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
-     .bus_reload_wm = vfe_bus_reload_wm,
+     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
      .wm_set_ping_addr = vfe_wm_set_ping_addr,
      .wm_set_pong_addr = vfe_wm_set_pong_addr,
-     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
-     .bus_enable_wr_if = vfe_bus_enable_wr_if,
-     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
      .wm_set_subsample = vfe_wm_set_subsample,
-     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
-     .set_xbar_cfg = vfe_set_xbar_cfg,
-     .set_realign_cfg = vfe_set_realign_cfg,
-     .set_rdi_cid = vfe_set_rdi_cid,
-     .reg_update = vfe_reg_update,
-     .reg_update_clear = vfe_reg_update_clear,
-     .enable_irq_wm_line = vfe_enable_irq_wm_line,
-     .enable_irq_pix_line = vfe_enable_irq_pix_line,
-     .enable_irq_common = vfe_enable_irq_common,
-     .set_demux_cfg = vfe_set_demux_cfg,
-     .set_scale_cfg = vfe_set_scale_cfg,
-     .set_crop_cfg = vfe_set_crop_cfg,
-     .set_clamp_cfg = vfe_set_clamp_cfg,
-     .set_qos = vfe48_set_qos,
-     .set_ds = vfe48_set_ds,
-     .set_cgc_override = vfe_set_cgc_override,
-     .set_camif_cfg = vfe_set_camif_cfg,
-     .set_camif_cmd = vfe_set_camif_cmd,
-     .set_module_cfg = vfe_set_module_cfg,
-     .camif_wait_for_stop = vfe_camif_wait_for_stop,
+     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_gen1;
+     vfe->ops_gen1 = &vfe_ops_gen1_4_7;
+     vfe->video_ops = vfe_video_ops_gen1;
+
+     vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_7 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
      .isr_read = vfe_isr_read,
-     .violation_read = vfe_violation_read,
      .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_gen1_disable,
+     .vfe_enable = vfe_gen1_enable,
+     .vfe_halt = vfe_gen1_halt,
+     .violation_read = vfe_violation_read,
  };
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +994 -0
new file mode 100644
index 000000000000..241f763f8386
@@ -0,0 +1,1166 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-4-8.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.8
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2021 Linaro Ltd.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
+
+#define VFE_0_HW_VERSION             0x000
+
+#define VFE_0_GLOBAL_RESET_CMD               0x018
+#define VFE_0_GLOBAL_RESET_CMD_CORE  BIT(0)
+#define VFE_0_GLOBAL_RESET_CMD_CAMIF BIT(1)
+#define VFE_0_GLOBAL_RESET_CMD_BUS   BIT(2)
+#define VFE_0_GLOBAL_RESET_CMD_BUS_BDG       BIT(3)
+#define VFE_0_GLOBAL_RESET_CMD_REGISTER      BIT(4)
+#define VFE_0_GLOBAL_RESET_CMD_PM    BIT(5)
+#define VFE_0_GLOBAL_RESET_CMD_BUS_MISR      BIT(6)
+#define VFE_0_GLOBAL_RESET_CMD_TESTGEN       BIT(7)
+#define VFE_0_GLOBAL_RESET_CMD_DSP   BIT(8)
+#define VFE_0_GLOBAL_RESET_CMD_IDLE_CGC      BIT(9)
+
+#define VFE_0_MODULE_LENS_EN         0x040
+#define VFE_0_MODULE_LENS_EN_DEMUX           BIT(2)
+#define VFE_0_MODULE_LENS_EN_CHROMA_UPSAMPLE BIT(3)
+
+#define VFE_0_MODULE_ZOOM_EN         0x04c
+#define VFE_0_MODULE_ZOOM_EN_SCALE_ENC               BIT(1)
+#define VFE_0_MODULE_ZOOM_EN_CROP_ENC                BIT(2)
+#define VFE_0_MODULE_ZOOM_EN_REALIGN_BUF     BIT(9)
+
+#define VFE_0_CORE_CFG                       0x050
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_YCBYCR  0x4
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_YCRYCB  0x5
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_CBYCRY  0x6
+#define VFE_0_CORE_CFG_PIXEL_PATTERN_CRYCBY  0x7
+#define VFE_0_CORE_CFG_COMPOSITE_REG_UPDATE_EN       BIT(4)
+
+#define VFE_0_IRQ_CMD                        0x058
+#define VFE_0_IRQ_CMD_GLOBAL_CLEAR   BIT(0)
+
+#define VFE_0_IRQ_MASK_0             0x05c
+#define VFE_0_IRQ_MASK_0_CAMIF_SOF                   BIT(0)
+#define VFE_0_IRQ_MASK_0_CAMIF_EOF                   BIT(1)
+#define VFE_0_IRQ_MASK_0_RDIn_REG_UPDATE(n)          BIT((n) + 5)
+#define VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(n)                \
+     ((n) == VFE_LINE_PIX ? BIT(4) : VFE_0_IRQ_MASK_0_RDIn_REG_UPDATE(n))
+#define VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
+#define VFE_0_IRQ_MASK_0_IMAGE_COMPOSITE_DONE_n(n)   BIT((n) + 25)
+#define VFE_0_IRQ_MASK_0_RESET_ACK                   BIT(31)
+#define VFE_0_IRQ_MASK_1             0x060
+#define VFE_0_IRQ_MASK_1_CAMIF_ERROR                 BIT(0)
+#define VFE_0_IRQ_MASK_1_VIOLATION                   BIT(7)
+#define VFE_0_IRQ_MASK_1_BUS_BDG_HALT_ACK            BIT(8)
+#define VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)      BIT((n) + 9)
+#define VFE_0_IRQ_MASK_1_RDIn_SOF(n)                 BIT((n) + 29)
+
+#define VFE_0_IRQ_CLEAR_0            0x064
+#define VFE_0_IRQ_CLEAR_1            0x068
+
+#define VFE_0_IRQ_STATUS_0           0x06c
+#define VFE_0_IRQ_STATUS_0_CAMIF_SOF                 BIT(0)
+#define VFE_0_IRQ_STATUS_0_RDIn_REG_UPDATE(n)                BIT((n) + 5)
+#define VFE_0_IRQ_STATUS_0_line_n_REG_UPDATE(n)              \
+     ((n) == VFE_LINE_PIX ? BIT(4) : VFE_0_IRQ_STATUS_0_RDIn_REG_UPDATE(n))
+#define VFE_0_IRQ_STATUS_0_IMAGE_MASTER_n_PING_PONG(n)       BIT((n) + 8)
+#define VFE_0_IRQ_STATUS_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
+#define VFE_0_IRQ_STATUS_0_RESET_ACK                 BIT(31)
+#define VFE_0_IRQ_STATUS_1           0x070
+#define VFE_0_IRQ_STATUS_1_VIOLATION                 BIT(7)
+#define VFE_0_IRQ_STATUS_1_BUS_BDG_HALT_ACK          BIT(8)
+#define VFE_0_IRQ_STATUS_1_RDIn_SOF(n)                       BIT((n) + 29)
+
+#define VFE_0_IRQ_COMPOSITE_MASK_0   0x074
+#define VFE_0_VIOLATION_STATUS               0x07c
+
+#define VFE_0_BUS_CMD                        0x80
+#define VFE_0_BUS_CMD_Mx_RLD_CMD(x)  BIT(x)
+
+#define VFE_0_BUS_CFG                        0x084
+
+#define VFE_0_BUS_XBAR_CFG_x(x)              (0x90 + 0x4 * ((x) / 2))
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN                        BIT(2)
+#define VFE_0_BUS_XBAR_CFG_x_M_REALIGN_BUF_EN                        BIT(3)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTRA                (0x1 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER                (0x2 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA  (0x3 << 4)
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT               8
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_LUMA                0x0
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0    0xc
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1    0xd
+#define VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2    0xe
+
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_CFG(n)           (0x0a0 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_CFG_WR_PATH_SHIFT        0
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_PING_ADDR(n)     (0x0a4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_PONG_ADDR(n)     (0x0ac + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(n)              (0x0b4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT 1
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_SHIFT      2
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK       (0x1f << 2)
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG(n)                (0x0b8 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG_OFFSET_SHIFT      16
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(n)    (0x0bc + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(n)    (0x0c0 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_FRAMEDROP_PATTERN(n)     \
+                                                     (0x0c4 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN(n) \
+                                                     (0x0c8 + 0x2c * (n))
+#define VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN_DEF        0xffffffff
+
+#define VFE_0_BUS_PING_PONG_STATUS   0x338
+
+#define VFE_0_BUS_BDG_CMD            0x400
+#define VFE_0_BUS_BDG_CMD_HALT_REQ   1
+
+#define VFE_0_BUS_BDG_QOS_CFG_0              0x404
+#define VFE_0_BUS_BDG_QOS_CFG_0_CFG  0xaaa5aaa5
+#define VFE_0_BUS_BDG_QOS_CFG_1              0x408
+#define VFE_0_BUS_BDG_QOS_CFG_2              0x40c
+#define VFE_0_BUS_BDG_QOS_CFG_3              0x410
+#define VFE_0_BUS_BDG_QOS_CFG_3_CFG  0xaa55aaa5
+#define VFE_0_BUS_BDG_QOS_CFG_4              0x414
+#define VFE_0_BUS_BDG_QOS_CFG_4_CFG  0xaa55aa55
+#define VFE_0_BUS_BDG_QOS_CFG_5              0x418
+#define VFE_0_BUS_BDG_QOS_CFG_6              0x41c
+#define VFE_0_BUS_BDG_QOS_CFG_7              0x420
+#define VFE_0_BUS_BDG_QOS_CFG_7_CFG  0x0005aa55
+
+#define VFE_0_BUS_BDG_DS_CFG_0               0x424
+#define VFE_0_BUS_BDG_DS_CFG_0_CFG   0xcccc1111
+#define VFE_0_BUS_BDG_DS_CFG_1               0x428
+#define VFE_0_BUS_BDG_DS_CFG_2               0x42c
+#define VFE_0_BUS_BDG_DS_CFG_3               0x430
+#define VFE_0_BUS_BDG_DS_CFG_4               0x434
+#define VFE_0_BUS_BDG_DS_CFG_5               0x438
+#define VFE_0_BUS_BDG_DS_CFG_6               0x43c
+#define VFE_0_BUS_BDG_DS_CFG_7               0x440
+#define VFE_0_BUS_BDG_DS_CFG_8               0x444
+#define VFE_0_BUS_BDG_DS_CFG_9               0x448
+#define VFE_0_BUS_BDG_DS_CFG_10              0x44c
+#define VFE_0_BUS_BDG_DS_CFG_11              0x450
+#define VFE_0_BUS_BDG_DS_CFG_12              0x454
+#define VFE_0_BUS_BDG_DS_CFG_13              0x458
+#define VFE_0_BUS_BDG_DS_CFG_14              0x45c
+#define VFE_0_BUS_BDG_DS_CFG_15              0x460
+#define VFE_0_BUS_BDG_DS_CFG_16              0x464
+#define VFE_0_BUS_BDG_DS_CFG_16_CFG  0x00000110
+
+#define VFE_0_RDI_CFG_x(x)           (0x46c + (0x4 * (x)))
+#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_SHIFT 28
+#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_MASK  (0xf << 28)
+#define VFE_0_RDI_CFG_x_RDI_M0_SEL_SHIFT     4
+#define VFE_0_RDI_CFG_x_RDI_M0_SEL_MASK              (0xf << 4)
+#define VFE_0_RDI_CFG_x_RDI_EN_BIT           BIT(2)
+#define VFE_0_RDI_CFG_x_MIPI_EN_BITS         0x3
+
+#define VFE_0_CAMIF_CMD                              0x478
+#define VFE_0_CAMIF_CMD_DISABLE_FRAME_BOUNDARY       0
+#define VFE_0_CAMIF_CMD_ENABLE_FRAME_BOUNDARY        1
+#define VFE_0_CAMIF_CMD_NO_CHANGE            3
+#define VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS   BIT(2)
+#define VFE_0_CAMIF_CFG                              0x47c
+#define VFE_0_CAMIF_CFG_VFE_OUTPUT_EN                BIT(6)
+#define VFE_0_CAMIF_FRAME_CFG                        0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG         0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG                0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG            0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN    0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN    0x49c
+#define VFE_0_CAMIF_STATUS                   0x4a4
+#define VFE_0_CAMIF_STATUS_HALT                      BIT(31)
+
+#define VFE_0_REG_UPDATE             0x4ac
+#define VFE_0_REG_UPDATE_RDIn(n)             BIT(1 + (n))
+#define VFE_0_REG_UPDATE_line_n(n)           \
+                     ((n) == VFE_LINE_PIX ? 1 : VFE_0_REG_UPDATE_RDIn(n))
+
+#define VFE_0_DEMUX_CFG                              0x560
+#define VFE_0_DEMUX_CFG_PERIOD                       0x3
+#define VFE_0_DEMUX_GAIN_0                   0x564
+#define VFE_0_DEMUX_GAIN_0_CH0_EVEN          (0x80 << 0)
+#define VFE_0_DEMUX_GAIN_0_CH0_ODD           (0x80 << 16)
+#define VFE_0_DEMUX_GAIN_1                   0x568
+#define VFE_0_DEMUX_GAIN_1_CH1                       (0x80 << 0)
+#define VFE_0_DEMUX_GAIN_1_CH2                       (0x80 << 16)
+#define VFE_0_DEMUX_EVEN_CFG                 0x574
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_YUYV    0x9cac
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_YVYU    0xac9c
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_UYVY    0xc9ca
+#define VFE_0_DEMUX_EVEN_CFG_PATTERN_VYUY    0xcac9
+#define VFE_0_DEMUX_ODD_CFG                  0x578
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_YUYV     0x9cac
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_YVYU     0xac9c
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_UYVY     0xc9ca
+#define VFE_0_DEMUX_ODD_CFG_PATTERN_VYUY     0xcac9
+
+#define VFE_0_SCALE_ENC_Y_CFG                        0x91c
+#define VFE_0_SCALE_ENC_Y_H_IMAGE_SIZE               0x920
+#define VFE_0_SCALE_ENC_Y_H_PHASE            0x924
+#define VFE_0_SCALE_ENC_Y_V_IMAGE_SIZE               0x934
+#define VFE_0_SCALE_ENC_Y_V_PHASE            0x938
+#define VFE_0_SCALE_ENC_CBCR_CFG             0x948
+#define VFE_0_SCALE_ENC_CBCR_H_IMAGE_SIZE    0x94c
+#define VFE_0_SCALE_ENC_CBCR_H_PHASE         0x950
+#define VFE_0_SCALE_ENC_CBCR_V_IMAGE_SIZE    0x960
+#define VFE_0_SCALE_ENC_CBCR_V_PHASE         0x964
+
+#define VFE_0_CROP_ENC_Y_WIDTH                       0x974
+#define VFE_0_CROP_ENC_Y_HEIGHT                      0x978
+#define VFE_0_CROP_ENC_CBCR_WIDTH            0x97c
+#define VFE_0_CROP_ENC_CBCR_HEIGHT           0x980
+
+#define VFE_0_CLAMP_ENC_MAX_CFG                      0x984
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH0          (0xff << 0)
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH1          (0xff << 8)
+#define VFE_0_CLAMP_ENC_MAX_CFG_CH2          (0xff << 16)
+#define VFE_0_CLAMP_ENC_MIN_CFG                      0x988
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH0          (0x0 << 0)
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH1          (0x0 << 8)
+#define VFE_0_CLAMP_ENC_MIN_CFG_CH2          (0x0 << 16)
+
+#define VFE_0_REALIGN_BUF_CFG                        0xaac
+#define VFE_0_REALIGN_BUF_CFG_CB_ODD_PIXEL     BIT(2)
+#define VFE_0_REALIGN_BUF_CFG_CR_ODD_PIXEL     BIT(3)
+#define VFE_0_REALIGN_BUF_CFG_HSUB_ENABLE      BIT(4)
+
+#define VFE_0_BUS_IMAGE_MASTER_CMD           0xcec
+#define VFE_0_BUS_IMAGE_MASTER_n_SHIFT(x)    (2 * (x))
+
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define MSM_VFE_VFE0_UB_SIZE 2047
+#define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3)
+#define MSM_VFE_VFE1_UB_SIZE 1535
+#define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+     u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);
+
+     dev_err(dev, "VFE HW Version = 0x%08x\n", hw_version);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{
+     u32 reset_bits = VFE_0_GLOBAL_RESET_CMD_IDLE_CGC        |
+                      VFE_0_GLOBAL_RESET_CMD_DSP             |
+                      VFE_0_GLOBAL_RESET_CMD_TESTGEN         |
+                      VFE_0_GLOBAL_RESET_CMD_BUS_MISR        |
+                      VFE_0_GLOBAL_RESET_CMD_PM              |
+                      VFE_0_GLOBAL_RESET_CMD_REGISTER        |
+                      VFE_0_GLOBAL_RESET_CMD_BUS_BDG         |
+                      VFE_0_GLOBAL_RESET_CMD_BUS             |
+                      VFE_0_GLOBAL_RESET_CMD_CAMIF           |
+                      VFE_0_GLOBAL_RESET_CMD_CORE;
+
+     writel_relaxed(BIT(31), vfe->base + VFE_0_IRQ_MASK_0);
+
+     /* Enforce barrier between IRQ mask setup and global reset */
+     wmb();
+     writel_relaxed(reset_bits, vfe->base + VFE_0_GLOBAL_RESET_CMD);
+}
+
+static void vfe_halt_request(struct vfe_device *vfe)
+{
+     writel_relaxed(VFE_0_BUS_BDG_CMD_HALT_REQ,
+                    vfe->base + VFE_0_BUS_BDG_CMD);
+}
+
+static void vfe_halt_clear(struct vfe_device *vfe)
+{
+     writel_relaxed(0x0, vfe->base + VFE_0_BUS_BDG_CMD);
+}
+
+static void vfe_wm_frame_based(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+     if (enable)
+             vfe_reg_set(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm),
+                     1 << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT);
+     else
+             vfe_reg_clr(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm),
+                     1 << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_BASED_SHIFT);
+}
+
+#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
+
+static int vfe_word_per_line_by_pixel(u32 format, u32 pixel_per_line)
+{
+     int val = 0;
+
+     switch (format) {
+     case V4L2_PIX_FMT_NV12:
+     case V4L2_PIX_FMT_NV21:
+     case V4L2_PIX_FMT_NV16:
+     case V4L2_PIX_FMT_NV61:
+             val = CALC_WORD(pixel_per_line, 1, 8);
+             break;
+     case V4L2_PIX_FMT_YUYV:
+     case V4L2_PIX_FMT_YVYU:
+     case V4L2_PIX_FMT_UYVY:
+     case V4L2_PIX_FMT_VYUY:
+             val = CALC_WORD(pixel_per_line, 2, 8);
+             break;
+     }
+
+     return val;
+}
+
+static int vfe_word_per_line_by_bytes(u32 bytes_per_line)
+{
+     return CALC_WORD(bytes_per_line, 1, 8);
+}
+
+static void vfe_get_wm_sizes(struct v4l2_pix_format_mplane *pix, u8 plane,
+                          u16 *width, u16 *height, u16 *bytesperline)
+{
+     switch (pix->pixelformat) {
+     case V4L2_PIX_FMT_NV12:
+     case V4L2_PIX_FMT_NV21:
+             *width = pix->width;
+             *height = pix->height;
+             *bytesperline = pix->plane_fmt[0].bytesperline;
+             if (plane == 1)
+                     *height /= 2;
+             break;
+     case V4L2_PIX_FMT_NV16:
+     case V4L2_PIX_FMT_NV61:
+             *width = pix->width;
+             *height = pix->height;
+             *bytesperline = pix->plane_fmt[0].bytesperline;
+             break;
+     case V4L2_PIX_FMT_YUYV:
+     case V4L2_PIX_FMT_YVYU:
+     case V4L2_PIX_FMT_VYUY:
+     case V4L2_PIX_FMT_UYVY:
+             *width = pix->width;
+             *height = pix->height;
+             *bytesperline = pix->plane_fmt[plane].bytesperline;
+             break;
+
+     }
+}
+
+static void vfe_wm_line_based(struct vfe_device *vfe, u32 wm,
+                           struct v4l2_pix_format_mplane *pix,
+                           u8 plane, u32 enable)
+{
+     u32 reg;
+
+     if (enable) {
+             u16 width = 0, height = 0, bytesperline = 0, wpl;
+
+             vfe_get_wm_sizes(pix, plane, &width, &height, &bytesperline);
+
+             wpl = vfe_word_per_line_by_pixel(pix->pixelformat, width);
+
+             reg = height - 1;
+             reg |= ((wpl + 3) / 4 - 1) << 16;
+
+             writel_relaxed(reg, vfe->base +
+                            VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(wm));
+
+             wpl = vfe_word_per_line_by_bytes(bytesperline);
+
+             reg = 0x3;
+             reg |= (height - 1) << 2;
+             reg |= ((wpl + 1) / 2) << 16;
+
+             writel_relaxed(reg, vfe->base +
+                            VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(wm));
+     } else {
+             writel_relaxed(0, vfe->base +
+                            VFE_0_BUS_IMAGE_MASTER_n_WR_IMAGE_SIZE(wm));
+             writel_relaxed(0, vfe->base +
+                            VFE_0_BUS_IMAGE_MASTER_n_WR_BUFFER_CFG(wm));
+     }
+}
+
+static void vfe_wm_set_framedrop_period(struct vfe_device *vfe, u8 wm, u8 per)
+{
+     u32 reg;
+
+     reg = readl_relaxed(vfe->base +
+                         VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm));
+
+     reg &= ~(VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK);
+
+     reg |= (per << VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_SHIFT)
+             & VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG_FRM_DROP_PER_MASK;
+
+     writel_relaxed(reg,
+                    vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_ADDR_CFG(wm));
+}
+
+static void vfe_wm_set_framedrop_pattern(struct vfe_device *vfe, u8 wm,
+                                      u32 pattern)
+{
+     writel_relaxed(pattern,
+            vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_FRAMEDROP_PATTERN(wm));
+}
+
+static void vfe_wm_set_ub_cfg(struct vfe_device *vfe, u8 wm,
+                           u16 offset, u16 depth)
+{
+     u32 reg;
+
+     reg = (offset << VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG_OFFSET_SHIFT) |
+             depth;
+     writel_relaxed(reg, vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_UB_CFG(wm));
+}
+
+static void vfe_bus_reload_wm(struct vfe_device *vfe, u8 wm)
+{
+     /* Enforce barrier between any outstanding register write */
+     wmb();
+
+     writel_relaxed(VFE_0_BUS_CMD_Mx_RLD_CMD(wm), vfe->base + VFE_0_BUS_CMD);
+
+     /* Use barrier to make sure bus reload is issued before anything else */
+     wmb();
+}
+
+static void vfe_wm_set_ping_addr(struct vfe_device *vfe, u8 wm, u32 addr)
+{
+     writel_relaxed(addr,
+                    vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_PING_ADDR(wm));
+}
+
+static void vfe_wm_set_pong_addr(struct vfe_device *vfe, u8 wm, u32 addr)
+{
+     writel_relaxed(addr,
+                    vfe->base + VFE_0_BUS_IMAGE_MASTER_n_WR_PONG_ADDR(wm));
+}
+
+static int vfe_wm_get_ping_pong_status(struct vfe_device *vfe, u8 wm)
+{
+     u32 reg;
+
+     reg = readl_relaxed(vfe->base + VFE_0_BUS_PING_PONG_STATUS);
+
+     return (reg >> wm) & 0x1;
+}
+
+static void vfe_bus_enable_wr_if(struct vfe_device *vfe, u8 enable)
+{
+     if (enable)
+             writel_relaxed(0x101, vfe->base + VFE_0_BUS_CFG);
+     else
+             writel_relaxed(0, vfe->base + VFE_0_BUS_CFG);
+}
+
+static void vfe_bus_connect_wm_to_rdi(struct vfe_device *vfe, u8 wm,
+                                   enum vfe_line_id id)
+{
+     u32 reg;
+
+     reg = VFE_0_RDI_CFG_x_MIPI_EN_BITS;
+     vfe_reg_set(vfe, VFE_0_RDI_CFG_x(0), reg);
+
+     reg = VFE_0_RDI_CFG_x_RDI_EN_BIT;
+     reg |= ((3 * id) << VFE_0_RDI_CFG_x_RDI_STREAM_SEL_SHIFT) &
+             VFE_0_RDI_CFG_x_RDI_STREAM_SEL_MASK;
+     vfe_reg_set(vfe, VFE_0_RDI_CFG_x(id), reg);
+
+     switch (id) {
+     case VFE_LINE_RDI0:
+     default:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     case VFE_LINE_RDI1:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     case VFE_LINE_RDI2:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     }
+
+     if (wm % 2 == 1)
+             reg <<= 16;
+
+     vfe_reg_set(vfe, VFE_0_BUS_XBAR_CFG_x(wm), reg);
+}
+
+static void vfe_wm_set_subsample(struct vfe_device *vfe, u8 wm)
+{
+     writel_relaxed(VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN_DEF,
+            vfe->base +
+            VFE_0_BUS_IMAGE_MASTER_n_WR_IRQ_SUBSAMPLE_PATTERN(wm));
+}
+
+static void vfe_bus_disconnect_wm_from_rdi(struct vfe_device *vfe, u8 wm,
+                                        enum vfe_line_id id)
+{
+     u32 reg;
+
+     reg = VFE_0_RDI_CFG_x_RDI_EN_BIT;
+     vfe_reg_clr(vfe, VFE_0_RDI_CFG_x(id), reg);
+
+     switch (id) {
+     case VFE_LINE_RDI0:
+     default:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI0 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     case VFE_LINE_RDI1:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI1 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     case VFE_LINE_RDI2:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_VAL_RDI2 <<
+                   VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+             break;
+     }
+
+     if (wm % 2 == 1)
+             reg <<= 16;
+
+     vfe_reg_clr(vfe, VFE_0_BUS_XBAR_CFG_x(wm), reg);
+}
+
+static void vfe_set_xbar_cfg(struct vfe_device *vfe, struct vfe_output *output,
+                          u8 enable)
+{
+     struct vfe_line *line = container_of(output, struct vfe_line, output);
+     u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+     u32 reg;
+
+     switch (p) {
+     case V4L2_PIX_FMT_NV12:
+     case V4L2_PIX_FMT_NV21:
+     case V4L2_PIX_FMT_NV16:
+     case V4L2_PIX_FMT_NV61:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_LUMA <<
+                     VFE_0_BUS_XBAR_CFG_x_M_SINGLE_STREAM_SEL_SHIFT;
+
+             if (output->wm_idx[0] % 2 == 1)
+                     reg <<= 16;
+
+             if (enable)
+                     vfe_reg_set(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+                                 reg);
+             else
+                     vfe_reg_clr(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+                                 reg);
+
+             reg = VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN;
+             if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV16)
+                     reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA;
+
+             if (output->wm_idx[1] % 2 == 1)
+                     reg <<= 16;
+
+             if (enable)
+                     vfe_reg_set(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[1]),
+                                 reg);
+             else
+                     vfe_reg_clr(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[1]),
+                                 reg);
+             break;
+     case V4L2_PIX_FMT_YUYV:
+     case V4L2_PIX_FMT_YVYU:
+     case V4L2_PIX_FMT_VYUY:
+     case V4L2_PIX_FMT_UYVY:
+             reg = VFE_0_BUS_XBAR_CFG_x_M_REALIGN_BUF_EN;
+             reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN;
+
+             if (p == V4L2_PIX_FMT_YUYV || p == V4L2_PIX_FMT_YVYU)
+                     reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA;
+
+             if (output->wm_idx[0] % 2 == 1)
+                     reg <<= 16;
+
+             if (enable)
+                     vfe_reg_set(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+                                 reg);
+             else
+                     vfe_reg_clr(vfe,
+                                 VFE_0_BUS_XBAR_CFG_x(output->wm_idx[0]),
+                                 reg);
+             break;
+     default:
+             break;
+     }
+}
+
+static void vfe_set_realign_cfg(struct vfe_device *vfe, struct vfe_line *line,
+                             u8 enable)
+{
+     u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+     u32 val = VFE_0_MODULE_ZOOM_EN_REALIGN_BUF;
+
+     if (p != V4L2_PIX_FMT_YUYV && p != V4L2_PIX_FMT_YVYU &&
+                     p != V4L2_PIX_FMT_VYUY && p != V4L2_PIX_FMT_UYVY)
+             return;
+
+     if (enable) {
+             vfe_reg_set(vfe, VFE_0_MODULE_ZOOM_EN, val);
+     } else {
+             vfe_reg_clr(vfe, VFE_0_MODULE_ZOOM_EN, val);
+             return;
+     }
+
+     val = VFE_0_REALIGN_BUF_CFG_HSUB_ENABLE;
+
+     if (p == V4L2_PIX_FMT_UYVY || p == V4L2_PIX_FMT_YUYV)
+             val |= VFE_0_REALIGN_BUF_CFG_CR_ODD_PIXEL;
+     else
+             val |= VFE_0_REALIGN_BUF_CFG_CB_ODD_PIXEL;
+
+     writel_relaxed(val, vfe->base + VFE_0_REALIGN_BUF_CFG);
+}
+
+static void vfe_set_rdi_cid(struct vfe_device *vfe, enum vfe_line_id id, u8 cid)
+{
+     vfe_reg_clr(vfe, VFE_0_RDI_CFG_x(id),
+                 VFE_0_RDI_CFG_x_RDI_M0_SEL_MASK);
+
+     vfe_reg_set(vfe, VFE_0_RDI_CFG_x(id),
+                 cid << VFE_0_RDI_CFG_x_RDI_M0_SEL_SHIFT);
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     vfe->reg_update |= VFE_0_REG_UPDATE_line_n(line_id);
+
+     /* Enforce barrier between line update and commit */
+     wmb();
+
+     writel_relaxed(vfe->reg_update, vfe->base + VFE_0_REG_UPDATE);
+
+     /* Make sure register update is issued before further reg writes */
+     wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+                                     enum vfe_line_id line_id)
+{
+     vfe->reg_update &= ~VFE_0_REG_UPDATE_line_n(line_id);
+}
+
+static void vfe_enable_irq_wm_line(struct vfe_device *vfe, u8 wm,
+                                enum vfe_line_id line_id, u8 enable)
+{
+     u32 irq_en0 = VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(wm) |
+                   VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(line_id);
+     u32 irq_en1 = VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(wm) |
+                   VFE_0_IRQ_MASK_1_RDIn_SOF(line_id);
+
+     if (enable) {
+             vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+             vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+     } else {
+             vfe_reg_clr(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+             vfe_reg_clr(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+     }
+}
+
+static void vfe_enable_irq_pix_line(struct vfe_device *vfe, u8 comp,
+                                 enum vfe_line_id line_id, u8 enable)
+{
+     struct vfe_output *output = &vfe->line[line_id].output;
+     unsigned int i;
+     u32 irq_en0;
+     u32 irq_en1;
+     u32 comp_mask = 0;
+
+     irq_en0 = VFE_0_IRQ_MASK_0_CAMIF_SOF;
+     irq_en0 |= VFE_0_IRQ_MASK_0_CAMIF_EOF;
+     irq_en0 |= VFE_0_IRQ_MASK_0_IMAGE_COMPOSITE_DONE_n(comp);
+     irq_en0 |= VFE_0_IRQ_MASK_0_line_n_REG_UPDATE(line_id);
+     irq_en1 = VFE_0_IRQ_MASK_1_CAMIF_ERROR;
+     for (i = 0; i < output->wm_num; i++) {
+             irq_en1 |= VFE_0_IRQ_MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(
+                                                     output->wm_idx[i]);
+             comp_mask |= (1 << output->wm_idx[i]) << comp * 8;
+     }
+
+     if (enable) {
+             vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+             vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+             vfe_reg_set(vfe, VFE_0_IRQ_COMPOSITE_MASK_0, comp_mask);
+     } else {
+             vfe_reg_clr(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+             vfe_reg_clr(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+             vfe_reg_clr(vfe, VFE_0_IRQ_COMPOSITE_MASK_0, comp_mask);
+     }
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+     u32 irq_en0 = VFE_0_IRQ_MASK_0_RESET_ACK;
+     u32 irq_en1 = VFE_0_IRQ_MASK_1_VIOLATION |
+                   VFE_0_IRQ_MASK_1_BUS_BDG_HALT_ACK;
+
+     vfe_reg_set(vfe, VFE_0_IRQ_MASK_0, irq_en0);
+     vfe_reg_set(vfe, VFE_0_IRQ_MASK_1, irq_en1);
+}
+
+static void vfe_set_demux_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+     u32 val, even_cfg, odd_cfg;
+
+     writel_relaxed(VFE_0_DEMUX_CFG_PERIOD, vfe->base + VFE_0_DEMUX_CFG);
+
+     val = VFE_0_DEMUX_GAIN_0_CH0_EVEN | VFE_0_DEMUX_GAIN_0_CH0_ODD;
+     writel_relaxed(val, vfe->base + VFE_0_DEMUX_GAIN_0);
+
+     val = VFE_0_DEMUX_GAIN_1_CH1 | VFE_0_DEMUX_GAIN_1_CH2;
+     writel_relaxed(val, vfe->base + VFE_0_DEMUX_GAIN_1);
+
+     switch (line->fmt[MSM_VFE_PAD_SINK].code) {
+     case MEDIA_BUS_FMT_YUYV8_2X8:
+             even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_YUYV;
+             odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_YUYV;
+             break;
+     case MEDIA_BUS_FMT_YVYU8_2X8:
+             even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_YVYU;
+             odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_YVYU;
+             break;
+     case MEDIA_BUS_FMT_UYVY8_2X8:
+     default:
+             even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_UYVY;
+             odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_UYVY;
+             break;
+     case MEDIA_BUS_FMT_VYUY8_2X8:
+             even_cfg = VFE_0_DEMUX_EVEN_CFG_PATTERN_VYUY;
+             odd_cfg = VFE_0_DEMUX_ODD_CFG_PATTERN_VYUY;
+             break;
+     }
+
+     writel_relaxed(even_cfg, vfe->base + VFE_0_DEMUX_EVEN_CFG);
+     writel_relaxed(odd_cfg, vfe->base + VFE_0_DEMUX_ODD_CFG);
+}
+
+static void vfe_set_scale_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+     u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+     u32 reg;
+     u16 input, output;
+     u8 interp_reso;
+     u32 phase_mult;
+
+     writel_relaxed(0x3, vfe->base + VFE_0_SCALE_ENC_Y_CFG);
+
+     input = line->fmt[MSM_VFE_PAD_SINK].width - 1;
+     output = line->compose.width - 1;
+     reg = (output << 16) | input;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_H_IMAGE_SIZE);
+
+     interp_reso = vfe_calc_interp_reso(input, output);
+     phase_mult = input * (1 << (14 + interp_reso)) / output;
+     reg = (interp_reso << 28) | phase_mult;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_H_PHASE);
+
+     input = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+     output = line->compose.height - 1;
+     reg = (output << 16) | input;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_V_IMAGE_SIZE);
+
+     interp_reso = vfe_calc_interp_reso(input, output);
+     phase_mult = input * (1 << (14 + interp_reso)) / output;
+     reg = (interp_reso << 28) | phase_mult;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_Y_V_PHASE);
+
+     writel_relaxed(0x3, vfe->base + VFE_0_SCALE_ENC_CBCR_CFG);
+
+     input = line->fmt[MSM_VFE_PAD_SINK].width - 1;
+     output = line->compose.width / 2 - 1;
+     reg = (output << 16) | input;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_H_IMAGE_SIZE);
+
+     interp_reso = vfe_calc_interp_reso(input, output);
+     phase_mult = input * (1 << (14 + interp_reso)) / output;
+     reg = (interp_reso << 28) | phase_mult;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_H_PHASE);
+
+     input = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+     output = line->compose.height - 1;
+     if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV21)
+             output = line->compose.height / 2 - 1;
+     reg = (output << 16) | input;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_V_IMAGE_SIZE);
+
+     interp_reso = vfe_calc_interp_reso(input, output);
+     phase_mult = input * (1 << (14 + interp_reso)) / output;
+     reg = (interp_reso << 28) | phase_mult;
+     writel_relaxed(reg, vfe->base + VFE_0_SCALE_ENC_CBCR_V_PHASE);
+}
+
+static void vfe_set_crop_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+     u32 p = line->video_out.active_fmt.fmt.pix_mp.pixelformat;
+     u32 reg;
+     u16 first, last;
+
+     first = line->crop.left;
+     last = line->crop.left + line->crop.width - 1;
+     reg = (first << 16) | last;
+     writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_Y_WIDTH);
+
+     first = line->crop.top;
+     last = line->crop.top + line->crop.height - 1;
+     reg = (first << 16) | last;
+     writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_Y_HEIGHT);
+
+     first = line->crop.left / 2;
+     last = line->crop.left / 2 + line->crop.width / 2 - 1;
+     reg = (first << 16) | last;
+     writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_CBCR_WIDTH);
+
+     first = line->crop.top;
+     last = line->crop.top + line->crop.height - 1;
+     if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV21) {
+             first = line->crop.top / 2;
+             last = line->crop.top / 2 + line->crop.height / 2 - 1;
+     }
+     reg = (first << 16) | last;
+     writel_relaxed(reg, vfe->base + VFE_0_CROP_ENC_CBCR_HEIGHT);
+}
+
+static void vfe_set_clamp_cfg(struct vfe_device *vfe)
+{
+     u32 val = VFE_0_CLAMP_ENC_MAX_CFG_CH0 |
+             VFE_0_CLAMP_ENC_MAX_CFG_CH1 |
+             VFE_0_CLAMP_ENC_MAX_CFG_CH2;
+
+     writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MAX_CFG);
+
+     val = VFE_0_CLAMP_ENC_MIN_CFG_CH0 |
+             VFE_0_CLAMP_ENC_MIN_CFG_CH1 |
+             VFE_0_CLAMP_ENC_MIN_CFG_CH2;
+
+     writel_relaxed(val, vfe->base + VFE_0_CLAMP_ENC_MIN_CFG);
+}
+
+static void vfe_set_cgc_override(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+     /* empty */
+}
+
+static void vfe_set_camif_cfg(struct vfe_device *vfe, struct vfe_line *line)
+{
+     u32 val;
+
+     switch (line->fmt[MSM_VFE_PAD_SINK].code) {
+     case MEDIA_BUS_FMT_YUYV8_2X8:
+             val = VFE_0_CORE_CFG_PIXEL_PATTERN_YCBYCR;
+             break;
+     case MEDIA_BUS_FMT_YVYU8_2X8:
+             val = VFE_0_CORE_CFG_PIXEL_PATTERN_YCRYCB;
+             break;
+     case MEDIA_BUS_FMT_UYVY8_2X8:
+     default:
+             val = VFE_0_CORE_CFG_PIXEL_PATTERN_CBYCRY;
+             break;
+     case MEDIA_BUS_FMT_VYUY8_2X8:
+             val = VFE_0_CORE_CFG_PIXEL_PATTERN_CRYCBY;
+             break;
+     }
+
+     val |= VFE_0_CORE_CFG_COMPOSITE_REG_UPDATE_EN;
+     writel_relaxed(val, vfe->base + VFE_0_CORE_CFG);
+
+     val = line->fmt[MSM_VFE_PAD_SINK].width * 2 - 1;
+     val |= (line->fmt[MSM_VFE_PAD_SINK].height - 1) << 16;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_FRAME_CFG);
+
+     val = line->fmt[MSM_VFE_PAD_SINK].width * 2 - 1;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_WINDOW_WIDTH_CFG);
+
+     val = line->fmt[MSM_VFE_PAD_SINK].height - 1;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_WINDOW_HEIGHT_CFG);
+
+     val = 0xffffffff;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_SUBSAMPLE_CFG);
+
+     val = 0xffffffff;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN);
+
+     val = 0xffffffff;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN);
+
+     val = VFE_0_RDI_CFG_x_MIPI_EN_BITS;
+     vfe_reg_set(vfe, VFE_0_RDI_CFG_x(0), val);
+
+     val = VFE_0_CAMIF_CFG_VFE_OUTPUT_EN;
+     writel_relaxed(val, vfe->base + VFE_0_CAMIF_CFG);
+}
+
+static void vfe_set_camif_cmd(struct vfe_device *vfe, u8 enable)
+{
+     u32 cmd;
+
+     cmd = VFE_0_CAMIF_CMD_CLEAR_CAMIF_STATUS | VFE_0_CAMIF_CMD_NO_CHANGE;
+     writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+
+     /* Make sure camif command is issued written before it is changed again */
+     wmb();
+
+     if (enable)
+             cmd = VFE_0_CAMIF_CMD_ENABLE_FRAME_BOUNDARY;
+     else
+             cmd = VFE_0_CAMIF_CMD_DISABLE_FRAME_BOUNDARY;
+
+     writel_relaxed(cmd, vfe->base + VFE_0_CAMIF_CMD);
+}
+
+static void vfe_set_module_cfg(struct vfe_device *vfe, u8 enable)
+{
+     u32 val_lens = VFE_0_MODULE_LENS_EN_DEMUX |
+                    VFE_0_MODULE_LENS_EN_CHROMA_UPSAMPLE;
+     u32 val_zoom = VFE_0_MODULE_ZOOM_EN_SCALE_ENC |
+                    VFE_0_MODULE_ZOOM_EN_CROP_ENC;
+
+     if (enable) {
+             vfe_reg_set(vfe, VFE_0_MODULE_LENS_EN, val_lens);
+             vfe_reg_set(vfe, VFE_0_MODULE_ZOOM_EN, val_zoom);
+     } else {
+             vfe_reg_clr(vfe, VFE_0_MODULE_LENS_EN, val_lens);
+             vfe_reg_clr(vfe, VFE_0_MODULE_ZOOM_EN, val_zoom);
+     }
+}
+
+static int vfe_camif_wait_for_stop(struct vfe_device *vfe, struct device *dev)
+{
+     u32 val;
+     int ret;
+
+     ret = readl_poll_timeout(vfe->base + VFE_0_CAMIF_STATUS,
+                              val,
+                              (val & VFE_0_CAMIF_STATUS_HALT),
+                              CAMIF_TIMEOUT_SLEEP_US,
+                              CAMIF_TIMEOUT_ALL_US);
+     if (ret < 0)
+             dev_err(dev, "%s: camif stop timeout\n", __func__);
+
+     return ret;
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+     struct vfe_device *vfe = dev;
+     u32 value0, value1;
+     int i, j;
+
+     vfe->ops->isr_read(vfe, &value0, &value1);
+
+     dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+             value0, value1);
+
+     if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
+             vfe->isr_ops.reset_ack(vfe);

drivers/media/platform/qcom/camss/camss-vfe-4-8.c line 1004

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +10 -0
+
+     if (value1 & VFE_0_IRQ_STATUS_1_VIOLATION)
+             vfe->ops->violation_read(vfe);
+
+     if (value1 & VFE_0_IRQ_STATUS_1_BUS_BDG_HALT_ACK)
+             vfe->isr_ops.halt_ack(vfe);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_PIX; i++)
+             if (value0 & VFE_0_IRQ_STATUS_0_line_n_REG_UPDATE(i))
+                     vfe->isr_ops.reg_update(vfe, i);

- calling this one with i equal to VFE_LINE_PIX would result in using

Quoted 8 lines

vfe->line[VFE_LINE_PIX] without explicit check against vfe->line_num. But as this vfe_isr() implementation is specifically for VFE version 4.8, this is no problem.
Maybe the "for (i = VFE_LINE_RDI0; i <= VFE_LINE_PIX; i++)" cycle could be changed to use "i < VFE_LINE_NUM_GEN1" or "i < vfe->line_num" instead, but I am not sure if it makes the code cleaner (functionally there is no difference; VFE_LINE_PIX == 3, VFE_LINE_NUM_GEN1 == 4, and for the 4.8 version vfe->line_num == VFE_LINE_NUM_GEN1).

I agree, I'll change it to vfe->vfe_num. Maybe some future copy-paste bugs can be avoided that way.

Quoted 684 lines

In any case,

Thanks,
Andrey

Quoted 676 lines
drivers/media/platform/qcom/camss/camss-vfe-4-8.c new file +161 -0
+     if (value0 & VFE_0_IRQ_STATUS_0_CAMIF_SOF)
+             vfe->isr_ops.sof(vfe, VFE_LINE_PIX);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (value1 & VFE_0_IRQ_STATUS_1_RDIn_SOF(i))
+                     vfe->isr_ops.sof(vfe, i);
+
+     for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+             if (value0 & VFE_0_IRQ_STATUS_0_IMAGE_COMPOSITE_DONE_n(i)) {
+                     vfe->isr_ops.comp_done(vfe, i);
+                     for (j = 0; j < ARRAY_SIZE(vfe->wm_output_map); j++)
+                             if (vfe->wm_output_map[j] == VFE_LINE_PIX)
+                                     value0 &= ~VFE_0_IRQ_MASK_0_IMAGE_MASTER_n_PING_PONG(j);
+             }
+
+     for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++)
+             if (value0 & VFE_0_IRQ_STATUS_0_IMAGE_MASTER_n_PING_PONG(i))
+                     vfe->isr_ops.wm_done(vfe, i);
+
+     return IRQ_HANDLED;
+}
+
+static u16 vfe_get_ub_size(u8 vfe_id)
+{
+     /* On VFE4.8 the ub-size is the same on both instances */
+     return MSM_VFE_VFE0_UB_SIZE_RDI;
+}
+
+static void vfe_wm_enable(struct vfe_device *vfe, u8 wm, u8 enable)
+{
+     if (enable)
+             writel_relaxed(2 << VFE_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
+                            vfe->base + VFE_0_BUS_IMAGE_MASTER_CMD);
+     else
+             writel_relaxed(1 << VFE_0_BUS_IMAGE_MASTER_n_SHIFT(wm),
+                            vfe->base + VFE_0_BUS_IMAGE_MASTER_CMD);
+
+     /* The WM must be enabled before sending other commands */
+     wmb();
+}
+
+static void vfe_set_qos(struct vfe_device *vfe)
+{
+     u32 val = VFE_0_BUS_BDG_QOS_CFG_0_CFG;
+     u32 val3 = VFE_0_BUS_BDG_QOS_CFG_3_CFG;
+     u32 val4 = VFE_0_BUS_BDG_QOS_CFG_4_CFG;
+     u32 val7 = VFE_0_BUS_BDG_QOS_CFG_7_CFG;
+
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_0);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_1);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_2);
+     writel_relaxed(val3, vfe->base + VFE_0_BUS_BDG_QOS_CFG_3);
+     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_4);
+     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
+     writel_relaxed(val4, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
+     writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
+}
+
+static void vfe_set_ds(struct vfe_device *vfe)
+{
+     u32 val = VFE_0_BUS_BDG_DS_CFG_0_CFG;
+     u32 val16 = VFE_0_BUS_BDG_DS_CFG_16_CFG;
+
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_0);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_1);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_2);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_3);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_4);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_5);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_6);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_7);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_8);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_9);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_10);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_11);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_12);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_13);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_14);
+     writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_DS_CFG_15);
+     writel_relaxed(val16, vfe->base + VFE_0_BUS_BDG_DS_CFG_16);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *value0, u32 *value1)
+{
+     *value0 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_0);
+     *value1 = readl_relaxed(vfe->base + VFE_0_IRQ_STATUS_1);
+
+     writel_relaxed(*value0, vfe->base + VFE_0_IRQ_CLEAR_0);
+     writel_relaxed(*value1, vfe->base + VFE_0_IRQ_CLEAR_1);
+
+     /* Enforce barrier between local & global IRQ clear */
+     wmb();
+     writel_relaxed(VFE_0_IRQ_CMD_GLOBAL_CLEAR, vfe->base + VFE_0_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+     u32 violation = readl_relaxed(vfe->base + VFE_0_VIOLATION_STATUS);
+
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+const struct vfe_hw_ops_gen1 vfe_ops_gen1_4_8 = {
+     .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi,
+     .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi,
+     .bus_enable_wr_if = vfe_bus_enable_wr_if,
+     .bus_reload_wm = vfe_bus_reload_wm,
+     .camif_wait_for_stop = vfe_camif_wait_for_stop,
+     .enable_irq_common = vfe_enable_irq_common,
+     .enable_irq_pix_line = vfe_enable_irq_pix_line,
+     .enable_irq_wm_line = vfe_enable_irq_wm_line,
+     .get_ub_size = vfe_get_ub_size,
+     .halt_clear = vfe_halt_clear,
+     .halt_request = vfe_halt_request,
+     .set_camif_cfg = vfe_set_camif_cfg,
+     .set_camif_cmd = vfe_set_camif_cmd,
+     .set_cgc_override = vfe_set_cgc_override,
+     .set_clamp_cfg = vfe_set_clamp_cfg,
+     .set_crop_cfg = vfe_set_crop_cfg,
+     .set_demux_cfg = vfe_set_demux_cfg,
+     .set_ds = vfe_set_ds,
+     .set_module_cfg = vfe_set_module_cfg,
+     .set_qos = vfe_set_qos,
+     .set_rdi_cid = vfe_set_rdi_cid,
+     .set_realign_cfg = vfe_set_realign_cfg,
+     .set_scale_cfg = vfe_set_scale_cfg,
+     .set_xbar_cfg = vfe_set_xbar_cfg,
+     .wm_enable = vfe_wm_enable,
+     .wm_frame_based = vfe_wm_frame_based,
+     .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status,
+     .wm_line_based = vfe_wm_line_based,
+     .wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern,
+     .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
+     .wm_set_ping_addr = vfe_wm_set_ping_addr,
+     .wm_set_pong_addr = vfe_wm_set_pong_addr,
+     .wm_set_subsample = vfe_wm_set_subsample,
+     .wm_set_ub_cfg = vfe_wm_set_ub_cfg,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_gen1;
+     vfe->ops_gen1 = &vfe_ops_gen1_4_8;
+     vfe->video_ops = vfe_video_ops_gen1;
+
+     vfe->line_num = VFE_LINE_NUM_GEN1;
+}
+
+const struct vfe_hw_ops vfe_ops_4_8 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
+     .isr_read = vfe_isr_read,
+     .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_gen1_disable,
+     .vfe_enable = vfe_gen1_enable,
+     .vfe_halt = vfe_gen1_halt,
+     .violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +509 -0
new file mode 100644
index 000000000000..b98f30f99e89
@@ -0,0 +1,763 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-gen1.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE Common functionality for Gen 1 versions of hw (4.1, 4.7..)
+ *
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+
+
+#include "camss.h"
+#include "camss-vfe.h"
+#include "camss-vfe-gen1.h"
+
+/* Max number of frame drop updates per frame */
+#define VFE_FRAME_DROP_UPDATES 2
+#define VFE_NEXT_SOF_MS 500
+
+
+int vfe_gen1_halt(struct vfe_device *vfe)
+{
+     unsigned long time;
+
+     return 0;
+
+     reinit_completion(&vfe->halt_complete);
+
+     vfe->ops_gen1->halt_request(vfe);
+
+     time = wait_for_completion_timeout(&vfe->halt_complete,
+                                        msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+     if (!time) {
+             dev_err(vfe->camss->dev, "VFE halt timeout\n");
+             return -EIO;
+     }
+
+     return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     unsigned long flags;
+     unsigned long time;
+     unsigned int i;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output->gen1.wait_sof = 1;
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     time = wait_for_completion_timeout(&output->sof, msecs_to_jiffies(VFE_NEXT_SOF_MS));
+     if (!time)
+             dev_err(vfe->camss->dev, "VFE sof timeout\n");
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     for (i = 0; i < output->wm_num; i++)
+             vfe->ops_gen1->wm_enable(vfe, output->wm_idx[i], 0);
+
+     ops->reg_update(vfe, line->id);
+     output->wait_reg_update = 1;
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     time = wait_for_completion_timeout(&output->reg_update, msecs_to_jiffies(VFE_NEXT_SOF_MS));
+     if (!time)
+             dev_err(vfe->camss->dev, "VFE reg update timeout\n");
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (line->id != VFE_LINE_PIX) {
+             vfe->ops_gen1->wm_frame_based(vfe, output->wm_idx[0], 0);
+             vfe->ops_gen1->bus_disconnect_wm_from_rdi(vfe, output->wm_idx[0], line->id);
+             vfe->ops_gen1->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 0);
+             vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[0], 0);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+     } else {
+             for (i = 0; i < output->wm_num; i++) {
+                     vfe->ops_gen1->wm_line_based(vfe, output->wm_idx[i], NULL, i, 0);
+                     vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[i], 0);
+             }
+
+             vfe->ops_gen1->enable_irq_pix_line(vfe, 0, line->id, 0);
+             vfe->ops_gen1->set_module_cfg(vfe, 0);
+             vfe->ops_gen1->set_realign_cfg(vfe, line, 0);
+             vfe->ops_gen1->set_xbar_cfg(vfe, output, 0);
+             vfe->ops_gen1->set_camif_cmd(vfe, 0);
+
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+             vfe->ops_gen1->camif_wait_for_stop(vfe, vfe->camss->dev);
+     }
+
+     return 0;
+}
+
+/*
+ * vfe_gen1_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_gen1_disable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+
+     vfe_disable_output(line);
+
+     vfe_put_output(line);
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (vfe->stream_count == 1)
+             vfe->ops_gen1->bus_enable_wr_if(vfe, 0);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return 0;
+}
+
+static void vfe_output_init_addrs(struct vfe_device *vfe,
+                               struct vfe_output *output, u8 sync,
+                               struct vfe_line *line)
+{
+     u32 ping_addr;
+     u32 pong_addr;
+     unsigned int i;
+
+     output->gen1.active_buf = 0;
+
+     for (i = 0; i < output->wm_num; i++) {
+             if (output->buf[0])
+                     ping_addr = output->buf[0]->addr[i];
+             else
+                     ping_addr = 0;
+
+             if (output->buf[1])
+                     pong_addr = output->buf[1]->addr[i];
+             else
+                     pong_addr = ping_addr;
+
+             vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], ping_addr);
+             vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], pong_addr);
+             if (sync)
+                     vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+     }
+}
+
+static void vfe_output_frame_drop(struct vfe_device *vfe,
+                               struct vfe_output *output,
+                               u32 drop_pattern)
+{
+     u8 drop_period;
+     unsigned int i;
+
+     /* We need to toggle update period to be valid on next frame */
+     output->drop_update_idx++;
+     output->drop_update_idx %= VFE_FRAME_DROP_UPDATES;
+     drop_period = VFE_FRAME_DROP_VAL + output->drop_update_idx;
+
+     for (i = 0; i < output->wm_num; i++) {
+             vfe->ops_gen1->wm_set_framedrop_period(vfe, output->wm_idx[i], drop_period);
+             vfe->ops_gen1->wm_set_framedrop_pattern(vfe, output->wm_idx[i], drop_pattern);
+     }
+
+     vfe->ops->reg_update(vfe, container_of(output, struct vfe_line, output)->id);
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     struct media_entity *sensor;
+     unsigned long flags;
+     unsigned int frame_skip = 0;
+     unsigned int i;
+     u16 ub_size;
+
+     ub_size = vfe->ops_gen1->get_ub_size(vfe->id);
+     if (!ub_size)
+             return -EINVAL;
+
+     sensor = camss_find_sensor(&line->subdev.entity);
+     if (sensor) {
+             struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+             /* Max frame skip is 29 frames */
+             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+                     frame_skip = VFE_FRAME_DROP_VAL - 1;
+     }
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     ops->reg_update_clear(vfe, line->id);
+
+     if (output->state != VFE_OUTPUT_RESERVED) {
+             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n", output->state);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return -EINVAL;
+     }
+     output->state = VFE_OUTPUT_IDLE;
+
+     output->buf[0] = vfe_buf_get_pending(output);
+     output->buf[1] = vfe_buf_get_pending(output);
+
+     if (!output->buf[0] && output->buf[1]) {
+             output->buf[0] = output->buf[1];
+             output->buf[1] = NULL;
+     }
+
+     if (output->buf[0])
+             output->state = VFE_OUTPUT_SINGLE;
+
+     if (output->buf[1])
+             output->state = VFE_OUTPUT_CONTINUOUS;
+
+     switch (output->state) {
+     case VFE_OUTPUT_SINGLE:
+             vfe_output_frame_drop(vfe, output, 1 << frame_skip);
+             break;
+     case VFE_OUTPUT_CONTINUOUS:
+             vfe_output_frame_drop(vfe, output, 3 << frame_skip);
+             break;
+     default:
+             vfe_output_frame_drop(vfe, output, 0);
+             break;
+     }
+
+     output->sequence = 0;
+     output->gen1.wait_sof = 0;
+     output->wait_reg_update = 0;
+     reinit_completion(&output->sof);
+     reinit_completion(&output->reg_update);
+
+     vfe_output_init_addrs(vfe, output, 0, line);
+
+     if (line->id != VFE_LINE_PIX) {
+             vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[0], 1);
+             vfe->ops_gen1->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 1);
+             vfe->ops_gen1->bus_connect_wm_to_rdi(vfe, output->wm_idx[0], line->id);
+             vfe->ops_gen1->wm_set_subsample(vfe, output->wm_idx[0]);
+             vfe->ops_gen1->set_rdi_cid(vfe, line->id, 0);
+             vfe->ops_gen1->wm_set_ub_cfg(vfe, output->wm_idx[0],
+                                         (ub_size + 1) * output->wm_idx[0], ub_size);
+             vfe->ops_gen1->wm_frame_based(vfe, output->wm_idx[0], 1);
+             vfe->ops_gen1->wm_enable(vfe, output->wm_idx[0], 1);
+             vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[0]);
+     } else {
+             ub_size /= output->wm_num;
+             for (i = 0; i < output->wm_num; i++) {
+                     vfe->ops_gen1->set_cgc_override(vfe, output->wm_idx[i], 1);
+                     vfe->ops_gen1->wm_set_subsample(vfe, output->wm_idx[i]);
+                     vfe->ops_gen1->wm_set_ub_cfg(vfe, output->wm_idx[i],
+                                                  (ub_size + 1) * output->wm_idx[i], ub_size);
+                     vfe->ops_gen1->wm_line_based(vfe, output->wm_idx[i],
+                                                  &line->video_out.active_fmt.fmt.pix_mp, i, 1);
+                     vfe->ops_gen1->wm_enable(vfe, output->wm_idx[i], 1);
+                     vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+             }
+             vfe->ops_gen1->enable_irq_pix_line(vfe, 0, line->id, 1);
+             vfe->ops_gen1->set_module_cfg(vfe, 1);
+             vfe->ops_gen1->set_camif_cfg(vfe, line);
+             vfe->ops_gen1->set_realign_cfg(vfe, line, 1);
+             vfe->ops_gen1->set_xbar_cfg(vfe, output, 1);
+             vfe->ops_gen1->set_demux_cfg(vfe, line);
+             vfe->ops_gen1->set_scale_cfg(vfe, line);
+             vfe->ops_gen1->set_crop_cfg(vfe, line);
+             vfe->ops_gen1->set_clamp_cfg(vfe);
+             vfe->ops_gen1->set_camif_cmd(vfe, 1);
+     }
+
+     ops->reg_update(vfe, line->id);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     struct v4l2_format *f = &line->video_out.active_fmt;
+     unsigned long flags;
+     int i;
+     int wm_idx;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output = &line->output;
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is running\n");
+             goto error;
+     }
+     output->state = VFE_OUTPUT_RESERVED;
+
+     output->gen1.active_buf = 0;
+
+     switch (f->fmt.pix_mp.pixelformat) {
+     case V4L2_PIX_FMT_NV12:
+     case V4L2_PIX_FMT_NV21:
+     case V4L2_PIX_FMT_NV16:
+     case V4L2_PIX_FMT_NV61:
+             output->wm_num = 2;
+             break;
+     default:
+             output->wm_num = 1;
+             break;
+     }
+
+     for (i = 0; i < output->wm_num; i++) {
+             wm_idx = vfe_reserve_wm(vfe, line->id);
+             if (wm_idx < 0) {
+                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
+                     goto error_get_wm;
+             }
+             output->wm_idx[i] = wm_idx;
+     }
+
+     output->drop_update_idx = 0;
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+
+error_get_wm:
+     for (i--; i >= 0; i--)
+             vfe_release_wm(vfe, output->wm_idx[i]);
+     output->state = VFE_OUTPUT_OFF;
+error:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return -EINVAL;
+}
+
+int vfe_gen1_enable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     int ret;
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (!vfe->stream_count) {
+             vfe->ops_gen1->enable_irq_common(vfe);
+             vfe->ops_gen1->bus_enable_wr_if(vfe, 1);
+             vfe->ops_gen1->set_qos(vfe);
+             vfe->ops_gen1->set_ds(vfe);
+     }
+
+     vfe->stream_count++;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     ret = vfe_get_output(line);
+     if (ret < 0)
+             goto error_get_output;
+
+     ret = vfe_enable_output(line);
+     if (ret < 0)
+             goto error_enable_output;
+
+     vfe->was_streaming = 1;
+
+     return 0;
+
+
+error_enable_output:
+     vfe_put_output(line);
+
+error_get_output:
+     mutex_lock(&vfe->stream_lock);
+
+     if (vfe->stream_count == 1)
+             vfe->ops_gen1->bus_enable_wr_if(vfe, 0);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return ret;
+}
+
+static void vfe_output_update_ping_addr(struct vfe_device *vfe,
+                                     struct vfe_output *output, u8 sync,
+                                     struct vfe_line *line)
+{
+     u32 addr;
+     unsigned int i;
+
+     for (i = 0; i < output->wm_num; i++) {
+             if (output->buf[0])
+                     addr = output->buf[0]->addr[i];
+             else
+                     addr = 0;
+
+             vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], addr);
+             if (sync)
+                     vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+     }
+}
+
+static void vfe_output_update_pong_addr(struct vfe_device *vfe,
+                                     struct vfe_output *output, u8 sync,
+                                     struct vfe_line *line)
+{
+     u32 addr;
+     unsigned int i;
+
+     for (i = 0; i < output->wm_num; i++) {
+             if (output->buf[1])
+                     addr = output->buf[1]->addr[i];
+             else
+                     addr = 0;
+
+             vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], addr);
+             if (sync)
+                     vfe->ops_gen1->bus_reload_wm(vfe, output->wm_idx[i]);
+
+     }
+
+}
+
+static void vfe_buf_update_wm_on_next(struct vfe_device *vfe,
+                                   struct vfe_output *output)
+{
+     switch (output->state) {
+     case VFE_OUTPUT_CONTINUOUS:
+             vfe_output_frame_drop(vfe, output, 3);
+             break;
+     case VFE_OUTPUT_SINGLE:
+     default:
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Next buf in wrong state! %d\n",
+                                 output->state);
+             break;
+     }
+}
+
+static void vfe_buf_update_wm_on_last(struct vfe_device *vfe,
+                                   struct vfe_output *output)
+{
+     switch (output->state) {
+     case VFE_OUTPUT_CONTINUOUS:
+             output->state = VFE_OUTPUT_SINGLE;
+             vfe_output_frame_drop(vfe, output, 1);
+             break;
+     case VFE_OUTPUT_SINGLE:
+             output->state = VFE_OUTPUT_STOPPING;
+             vfe_output_frame_drop(vfe, output, 0);
+             break;
+     default:
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Last buff in wrong state! %d\n",
+                                 output->state);
+             break;
+     }
+}
+
+static void vfe_buf_update_wm_on_new(struct vfe_device *vfe,
+                                  struct vfe_output *output,
+                                  struct camss_buffer *new_buf,
+                                  struct vfe_line *line)
+{
+     int inactive_idx;
+
+     switch (output->state) {
+     case VFE_OUTPUT_SINGLE:
+             inactive_idx = !output->gen1.active_buf;
+
+             if (!output->buf[inactive_idx]) {
+                     output->buf[inactive_idx] = new_buf;
+
+                     if (inactive_idx)
+                             vfe_output_update_pong_addr(vfe, output, 0, line);
+                     else
+                             vfe_output_update_ping_addr(vfe, output, 0, line);
+
+                     vfe_output_frame_drop(vfe, output, 3);
+                     output->state = VFE_OUTPUT_CONTINUOUS;
+             } else {
+                     vfe_buf_add_pending(output, new_buf);
+                     dev_err_ratelimited(vfe->camss->dev,
+                                         "Inactive buffer is busy\n");
+             }
+             break;
+
+     case VFE_OUTPUT_IDLE:
+             if (!output->buf[0]) {
+                     output->buf[0] = new_buf;
+
+                     vfe_output_init_addrs(vfe, output, 1, line);
+                     vfe_output_frame_drop(vfe, output, 1);
+
+                     output->state = VFE_OUTPUT_SINGLE;
+             } else {
+                     vfe_buf_add_pending(output, new_buf);
+                     dev_err_ratelimited(vfe->camss->dev,
+                                         "Output idle with buffer set!\n");
+             }
+             break;
+
+     case VFE_OUTPUT_CONTINUOUS:
+     default:
+             vfe_buf_add_pending(output, new_buf);
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-gen1.c line 515

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +6 -0
+             break;
+     }
+}
+
+/*
+ * vfe_isr_halt_ack - Process start of frame interrupt

- nitpick: wrong description of the function

Ack, thanks for finding this.

Quoted 1,568 lines
Quoted 1,568 lines
drivers/media/platform/qcom/camss/camss-vfe-gen1.c new file +248 -0
+ * @vfe: VFE Device
+ */
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+     complete(&vfe->halt_complete);
+     vfe->ops_gen1->halt_clear(vfe);
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     output = &vfe->line[line_id].output;
+     if (output->gen1.wait_sof) {
+             output->gen1.wait_sof = 0;
+             complete(&output->sof);
+     }
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     struct vfe_line *line = &vfe->line[line_id];
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     vfe->ops->reg_update_clear(vfe, line_id);
+
+     output = &line->output;
+
+     if (output->wait_reg_update) {
+             output->wait_reg_update = 0;
+             complete(&output->reg_update);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return;
+     }
+
+     if (output->state == VFE_OUTPUT_STOPPING) {
+             /* Release last buffer when hw is idle */
+             if (output->last_buffer) {
+                     vb2_buffer_done(&output->last_buffer->vb.vb2_buf,
+                                     VB2_BUF_STATE_DONE);
+                     output->last_buffer = NULL;
+             }
+             output->state = VFE_OUTPUT_IDLE;
+
+             /* Buffers received in stopping state are queued in */
+             /* dma pending queue, start next capture here */
+
+             output->buf[0] = vfe_buf_get_pending(output);
+             output->buf[1] = vfe_buf_get_pending(output);
+
+             if (!output->buf[0] && output->buf[1]) {
+                     output->buf[0] = output->buf[1];
+                     output->buf[1] = NULL;
+             }
+
+             if (output->buf[0])
+                     output->state = VFE_OUTPUT_SINGLE;
+
+             if (output->buf[1])
+                     output->state = VFE_OUTPUT_CONTINUOUS;
+
+             switch (output->state) {
+             case VFE_OUTPUT_SINGLE:
+                     vfe_output_frame_drop(vfe, output, 2);
+                     break;
+             case VFE_OUTPUT_CONTINUOUS:
+                     vfe_output_frame_drop(vfe, output, 3);
+                     break;
+             default:
+                     vfe_output_frame_drop(vfe, output, 0);
+                     break;
+             }
+
+             vfe_output_init_addrs(vfe, output, 1, &vfe->line[line_id]);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+     struct camss_buffer *ready_buf;
+     struct vfe_output *output;
+     dma_addr_t *new_addr;
+     unsigned long flags;
+     u32 active_index;
+     u64 ts = ktime_get_ns();
+     unsigned int i;
+
+     active_index = vfe->ops_gen1->wm_get_ping_pong_status(vfe, wm);
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Received wm done for unmapped index\n");
+             goto out_unlock;
+     }
+     output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+     if (output->gen1.active_buf == active_index && 0) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Active buffer mismatch!\n");
+             goto out_unlock;
+     }
+     output->gen1.active_buf = active_index;
+
+     ready_buf = output->buf[!active_index];
+     if (!ready_buf) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Missing ready buf %d %d!\n",
+                                 !active_index, output->state);
+             goto out_unlock;
+     }
+
+     ready_buf->vb.vb2_buf.timestamp = ts;
+     ready_buf->vb.sequence = output->sequence++;
+
+     /* Get next buffer */
+     output->buf[!active_index] = vfe_buf_get_pending(output);
+     if (!output->buf[!active_index]) {
+             /* No next buffer - set same address */
+             new_addr = ready_buf->addr;
+             vfe_buf_update_wm_on_last(vfe, output);
+     } else {
+             new_addr = output->buf[!active_index]->addr;
+             vfe_buf_update_wm_on_next(vfe, output);
+     }
+
+     if (active_index)
+             for (i = 0; i < output->wm_num; i++)
+                     vfe->ops_gen1->wm_set_ping_addr(vfe, output->wm_idx[i], new_addr[i]);
+     else
+             for (i = 0; i < output->wm_num; i++)
+                     vfe->ops_gen1->wm_set_pong_addr(vfe, output->wm_idx[i], new_addr[i]);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     if (output->state == VFE_OUTPUT_STOPPING)
+             output->last_buffer = ready_buf;
+     else
+             vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+     return;
+
+out_unlock:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid, struct camss_buffer *buf)
+{
+     struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+
+     output = &line->output;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     vfe_buf_update_wm_on_new(vfe, output, buf, line);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+inline u8 vfe_calc_interp_reso(u16 input, u16 output)
+{
+     if (input / output >= 16)
+             return 0;
+
+     if (input / output >= 8)
+             return 1;
+
+     if (input / output >= 4)
+             return 2;
+
+     return 3;
+}
+
+#define CALC_WORD(width, M, N) (((width) * (M) + (N) - 1) / (N))
+
+int vfe_word_per_line(u32 format, u32 width)
+{
+     int val = 0;
+
+     switch (format) {
+     case V4L2_PIX_FMT_NV12:
+     case V4L2_PIX_FMT_NV21:
+     case V4L2_PIX_FMT_NV16:
+     case V4L2_PIX_FMT_NV61:
+             val = CALC_WORD(width, 1, 8);
+             break;
+     case V4L2_PIX_FMT_YUYV:
+     case V4L2_PIX_FMT_YVYU:
+     case V4L2_PIX_FMT_UYVY:
+     case V4L2_PIX_FMT_VYUY:
+             val = CALC_WORD(width, 2, 8);
+             break;
+     }
+
+     return val;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_gen1 = {
+     .reset_ack = vfe_isr_reset_ack,
+     .halt_ack = vfe_isr_halt_ack,
+     .reg_update = vfe_isr_reg_update,
+     .sof = vfe_isr_sof,
+     .comp_done = vfe_isr_comp_done,
+     .wm_done = vfe_isr_wm_done,
+};
+
+const struct camss_video_ops vfe_video_ops_gen1 = {
+     .queue_buffer = vfe_queue_buffer,
+     .flush_buffers = vfe_flush_buffers,
+};
drivers/media/platform/qcom/camss/camss-vfe-gen1.h new file +110 -0
new file mode 100644
index 000000000000..42e8a3333034
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * camss-vfe.h
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.
+ */
+#ifndef QC_MSM_CAMSS_VFE_GEN1_H
+#define QC_MSM_CAMSS_VFE_GEN1_H
+
+
+#include "camss-vfe.h"
+
+
+enum vfe_line_id;
+struct vfe_device;
+struct vfe_line;
+struct vfe_output;
+
+struct vfe_hw_ops_gen1 {
+     void (*bus_connect_wm_to_rdi)(struct vfe_device *vfe, u8 wm, enum vfe_line_id id);
+     void (*bus_disconnect_wm_from_rdi)(struct vfe_device *vfe, u8 wm, enum vfe_line_id id);
+     void (*bus_enable_wr_if)(struct vfe_device *vfe, u8 enable);
+     void (*bus_reload_wm)(struct vfe_device *vfe, u8 wm);
+     int (*camif_wait_for_stop)(struct vfe_device *vfe, struct device *dev);
+     void (*enable_irq_common)(struct vfe_device *vfe);
+     void (*enable_irq_wm_line)(struct vfe_device *vfe, u8 wm, enum vfe_line_id line_id,
+                                u8 enable);
+     void (*enable_irq_pix_line)(struct vfe_device *vfe, u8 comp, enum vfe_line_id line_id,
+                                 u8 enable);
+     u16 (*get_ub_size)(u8 vfe_id);
+     void (*halt_clear)(struct vfe_device *vfe);
+     void (*halt_request)(struct vfe_device *vfe);
+     void (*set_camif_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+     void (*set_camif_cmd)(struct vfe_device *vfe, u8 enable);
+     void (*set_cgc_override)(struct vfe_device *vfe, u8 wm, u8 enable);
+     void (*set_clamp_cfg)(struct vfe_device *vfe);
+     void (*set_crop_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+     void (*set_demux_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+     void (*set_ds)(struct vfe_device *vfe);
+     void (*set_module_cfg)(struct vfe_device *vfe, u8 enable);
+     void (*set_scale_cfg)(struct vfe_device *vfe, struct vfe_line *line);
+     void (*set_rdi_cid)(struct vfe_device *vfe, enum vfe_line_id id, u8 cid);
+     void (*set_realign_cfg)(struct vfe_device *vfe, struct vfe_line *line, u8 enable);
+     void (*set_qos)(struct vfe_device *vfe);
+     void (*set_xbar_cfg)(struct vfe_device *vfe, struct vfe_output *output, u8 enable);
+     void (*wm_frame_based)(struct vfe_device *vfe, u8 wm, u8 enable);
+     void (*wm_line_based)(struct vfe_device *vfe, u32 wm, struct v4l2_pix_format_mplane *pix,
+                           u8 plane, u32 enable);
+     void (*wm_set_ub_cfg)(struct vfe_device *vfe, u8 wm, u16 offset, u16 depth);
+     void (*wm_set_subsample)(struct vfe_device *vfe, u8 wm);
+     void (*wm_set_framedrop_period)(struct vfe_device *vfe, u8 wm, u8 per);
+     void (*wm_set_framedrop_pattern)(struct vfe_device *vfe, u8 wm, u32 pattern);
+     void (*wm_set_ping_addr)(struct vfe_device *vfe, u8 wm, u32 addr);
+     void (*wm_set_pong_addr)(struct vfe_device *vfe, u8 wm, u32 addr);
+     int (*wm_get_ping_pong_status)(struct vfe_device *vfe, u8 wm);
+     void (*wm_enable)(struct vfe_device *vfe, u8 wm, u8 enable);
+};
+
+/*
+ * vfe_calc_interp_reso - Calculate interpolation mode
+ * @input: Input resolution
+ * @output: Output resolution
+ *
+ * Return interpolation mode
+ */
+inline u8 vfe_calc_interp_reso(u16 input, u16 output);
+
+/*
+ * vfe_gen1_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_gen1_disable(struct vfe_line *line);
+
+
+/*
+ * vfe_gen1_enable - Enable VFE module
+ * @line: VFE line
+ *
+ * Return 0 on success
+ */
+int vfe_gen1_enable(struct vfe_line *line);
+
+/*
+ * vfe_gen1_enable - Halt VFE module
+ * @vfe: VFE device
+ *
+ * Return 0 on success
+ */
+int vfe_gen1_halt(struct vfe_device *vfe);
+
+/*
+ * vfe_word_per_line - Calculate number of words per frame width
+ * @format: V4L2 format
+ * @width: Frame width
+ *
+ * Return number of words per frame width
+ */
+int vfe_word_per_line(u32 format, u32 width);
+
+
+extern const struct vfe_isr_ops vfe_isr_ops_gen1;
+extern const struct camss_video_ops vfe_video_ops_gen1;
+
+
+#endif /* QC_MSM_CAMSS_VFE_GEN1_H */
drivers/media/platform/qcom/camss/camss-vfe.c +26 -764
index 94c9ca7d5cbb..375843bd16af 100644
@@ -26,22 +26,8 @@
 
  #define MSM_VFE_NAME "msm_vfe"
 
-#define vfe_line_array(ptr_line)     \
-     ((const struct vfe_line (*)[]) &(ptr_line[-(ptr_line->id)]))
-
-#define to_vfe(ptr_line)     \
-     container_of(vfe_line_array(ptr_line), struct vfe_device, line)
-
  /* VFE reset timeout */
  #define VFE_RESET_TIMEOUT_MS 50
-/* VFE halt timeout */
-#define VFE_HALT_TIMEOUT_MS 100
-/* Max number of frame drop updates per frame */
-#define VFE_FRAME_DROP_UPDATES 2
-/* Frame drop value. VAL + UPDATES - 1 should not exceed 31 */
-#define VFE_FRAME_DROP_VAL 30
-
-#define VFE_NEXT_SOF_MS 500
 
  #define SCALER_RATIO_MAX 16
 
@@ -294,35 +280,11 @@ static int vfe_reset(struct vfe_device *vfe)
      return 0;
  }
 
-/*
- * vfe_halt - Trigger halt on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_halt(struct vfe_device *vfe)
-{
-     unsigned long time;
-
-     reinit_completion(&vfe->halt_complete);
-
-     vfe->ops->halt_request(vfe);
-
-     time = wait_for_completion_timeout(&vfe->halt_complete,
-             msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
-     if (!time) {
-             dev_err(vfe->camss->dev, "VFE halt timeout\n");
-             return -EIO;
-     }
-
-     return 0;
-}
-
  static void vfe_init_outputs(struct vfe_device *vfe)
  {
      int i;
 
-     for (i = 0; i < ARRAY_SIZE(vfe->line); i++) {
+     for (i = 0; i < vfe->line_num; i++) {
              struct vfe_output *output = &vfe->line[i].output;
 
              output->state = VFE_OUTPUT_OFF;
@@ -340,71 +302,7 @@ static void vfe_reset_output_maps(struct vfe_device *vfe)
              vfe->wm_output_map[i] = VFE_LINE_NONE;
  }
 
-static void vfe_output_init_addrs(struct vfe_device *vfe,
-                               struct vfe_output *output, u8 sync)
-{
-     u32 ping_addr;
-     u32 pong_addr;
-     unsigned int i;
-
-     output->active_buf = 0;
-
-     for (i = 0; i < output->wm_num; i++) {
-             if (output->buf[0])
-                     ping_addr = output->buf[0]->addr[i];
-             else
-                     ping_addr = 0;
-
-             if (output->buf[1])
-                     pong_addr = output->buf[1]->addr[i];
-             else
-                     pong_addr = ping_addr;
-
-             vfe->ops->wm_set_ping_addr(vfe, output->wm_idx[i], ping_addr);
-             vfe->ops->wm_set_pong_addr(vfe, output->wm_idx[i], pong_addr);
-             if (sync)
-                     vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-     }
-}
-
-static void vfe_output_update_ping_addr(struct vfe_device *vfe,
-                                     struct vfe_output *output, u8 sync)
-{
-     u32 addr;
-     unsigned int i;
-
-     for (i = 0; i < output->wm_num; i++) {
-             if (output->buf[0])
-                     addr = output->buf[0]->addr[i];
-             else
-                     addr = 0;
-
-             vfe->ops->wm_set_ping_addr(vfe, output->wm_idx[i], addr);
-             if (sync)
-                     vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-     }
-}
-
-static void vfe_output_update_pong_addr(struct vfe_device *vfe,
-                                     struct vfe_output *output, u8 sync)
-{
-     u32 addr;
-     unsigned int i;
-
-     for (i = 0; i < output->wm_num; i++) {
-             if (output->buf[1])
-                     addr = output->buf[1]->addr[i];
-             else
-                     addr = 0;
-
-             vfe->ops->wm_set_pong_addr(vfe, output->wm_idx[i], addr);
-             if (sync)
-                     vfe->ops->bus_reload_wm(vfe, output->wm_idx[i]);
-     }
-
-}
-
-static int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
+int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
  {
      int ret = -EBUSY;
      int i;
@@ -420,7 +318,7 @@ static int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id)
      return ret;
  }
 
-static int vfe_release_wm(struct vfe_device *vfe, u8 wm)
+int vfe_release_wm(struct vfe_device *vfe, u8 wm)
  {
      if (wm >= ARRAY_SIZE(vfe->wm_output_map))
              return -EINVAL;
@@ -430,29 +328,7 @@ static int vfe_release_wm(struct vfe_device *vfe, u8 wm)
      return 0;
  }
 
-static void vfe_output_frame_drop(struct vfe_device *vfe,
-                               struct vfe_output *output,
-                               u32 drop_pattern)
-{
-     u8 drop_period;
-     unsigned int i;
-
-     /* We need to toggle update period to be valid on next frame */
-     output->drop_update_idx++;
-     output->drop_update_idx %= VFE_FRAME_DROP_UPDATES;
-     drop_period = VFE_FRAME_DROP_VAL + output->drop_update_idx;
-
-     for (i = 0; i < output->wm_num; i++) {
-             vfe->ops->wm_set_framedrop_period(vfe, output->wm_idx[i],
-                                               drop_period);
-             vfe->ops->wm_set_framedrop_pattern(vfe, output->wm_idx[i],
-                                                drop_pattern);
-     }
-     vfe->ops->reg_update(vfe,
-                          container_of(output, struct vfe_line, output)->id);
-}
-
-static struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
+struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
  {
      struct camss_buffer *buffer = NULL;
 
@@ -466,13 +342,8 @@ static struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output)
      return buffer;
  }
 
-/*
- * vfe_buf_add_pending - Add output buffer to list of pending
- * @output: VFE output
- * @buffer: Video buffer
- */
-static void vfe_buf_add_pending(struct vfe_output *output,
-                             struct camss_buffer *buffer)
+void vfe_buf_add_pending(struct vfe_output *output,
+                      struct camss_buffer *buffer)
  {
      INIT_LIST_HEAD(&buffer->queue);
      list_add_tail(&buffer->queue, &output->pending_bufs);
@@ -495,149 +366,7 @@ static void vfe_buf_flush_pending(struct vfe_output *output,
      }
  }
 
-static void vfe_buf_update_wm_on_next(struct vfe_device *vfe,
-                                   struct vfe_output *output)
-{
-     switch (output->state) {
-     case VFE_OUTPUT_CONTINUOUS:
-             vfe_output_frame_drop(vfe, output, 3);
-             break;
-     case VFE_OUTPUT_SINGLE:
-     default:
-             dev_err_ratelimited(vfe->camss->dev,
-                                 "Next buf in wrong state! %d\n",
-                                 output->state);
-             break;
-     }
-}
-
-static void vfe_buf_update_wm_on_last(struct vfe_device *vfe,
-                                   struct vfe_output *output)
-{
-     switch (output->state) {
-     case VFE_OUTPUT_CONTINUOUS:
-             output->state = VFE_OUTPUT_SINGLE;
-             vfe_output_frame_drop(vfe, output, 1);
-             break;
-     case VFE_OUTPUT_SINGLE:
-             output->state = VFE_OUTPUT_STOPPING;
-             vfe_output_frame_drop(vfe, output, 0);
-             break;
-     default:
-             dev_err_ratelimited(vfe->camss->dev,
-                                 "Last buff in wrong state! %d\n",
-                                 output->state);
-             break;
-     }
-}
-
-static void vfe_buf_update_wm_on_new(struct vfe_device *vfe,
-                                  struct vfe_output *output,
-                                  struct camss_buffer *new_buf)
-{
-     int inactive_idx;
-
-     switch (output->state) {
-     case VFE_OUTPUT_SINGLE:
-             inactive_idx = !output->active_buf;
-
-             if (!output->buf[inactive_idx]) {
-                     output->buf[inactive_idx] = new_buf;
-
-                     if (inactive_idx)
-                             vfe_output_update_pong_addr(vfe, output, 0);
-                     else
-                             vfe_output_update_ping_addr(vfe, output, 0);
-
-                     vfe_output_frame_drop(vfe, output, 3);
-                     output->state = VFE_OUTPUT_CONTINUOUS;
-             } else {
-                     vfe_buf_add_pending(output, new_buf);
-                     dev_err_ratelimited(vfe->camss->dev,
-                                         "Inactive buffer is busy\n");
-             }
-             break;
-
-     case VFE_OUTPUT_IDLE:
-             if (!output->buf[0]) {
-                     output->buf[0] = new_buf;
-
-                     vfe_output_init_addrs(vfe, output, 1);
-
-                     vfe_output_frame_drop(vfe, output, 1);
-                     output->state = VFE_OUTPUT_SINGLE;
-             } else {
-                     vfe_buf_add_pending(output, new_buf);
-                     dev_err_ratelimited(vfe->camss->dev,
-                                         "Output idle with buffer set!\n");
-             }
-             break;
-
-     case VFE_OUTPUT_CONTINUOUS:
-     default:
-             vfe_buf_add_pending(output, new_buf);
-             break;
-     }
-}
-
-static int vfe_get_output(struct vfe_line *line)
-{
-     struct vfe_device *vfe = to_vfe(line);
-     struct vfe_output *output;
-     struct v4l2_format *f = &line->video_out.active_fmt;
-     unsigned long flags;
-     int i;
-     int wm_idx;
-
-     spin_lock_irqsave(&vfe->output_lock, flags);
-
-     output = &line->output;
-     if (output->state != VFE_OUTPUT_OFF) {
-             dev_err(vfe->camss->dev, "Output is running\n");
-             goto error;
-     }
-     output->state = VFE_OUTPUT_RESERVED;
-
-     output->active_buf = 0;
-
-     switch (f->fmt.pix_mp.pixelformat) {
-     case V4L2_PIX_FMT_NV12:
-     case V4L2_PIX_FMT_NV21:
-     case V4L2_PIX_FMT_NV16:
-     case V4L2_PIX_FMT_NV61:
-             output->wm_num = 2;
-             break;
-     default:
-             output->wm_num = 1;
-             break;
-     }
-
-     for (i = 0; i < output->wm_num; i++) {
-             wm_idx = vfe_reserve_wm(vfe, line->id);
-             if (wm_idx < 0) {
-                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
-                     goto error_get_wm;
-             }
-             output->wm_idx[i] = wm_idx;
-     }
-
-     output->drop_update_idx = 0;
-
-     spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-     return 0;
-
-error_get_wm:
-     for (i--; i >= 0; i--)
-             vfe_release_wm(vfe, output->wm_idx[i]);
-     output->state = VFE_OUTPUT_OFF;
-error:
-     spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-     return -EINVAL;
-}
-
-static int vfe_put_output(struct vfe_line *line)
+int vfe_put_output(struct vfe_line *line)
  {
      struct vfe_device *vfe = to_vfe(line);
      struct vfe_output *output = &line->output;
@@ -655,454 +384,27 @@ static int vfe_put_output(struct vfe_line *line)
      return 0;
  }
 
-static int vfe_enable_output(struct vfe_line *line)
-{
-     struct vfe_device *vfe = to_vfe(line);
-     struct vfe_output *output = &line->output;
-     const struct vfe_hw_ops *ops = vfe->ops;
-     struct media_entity *sensor;
-     unsigned long flags;
-     unsigned int frame_skip = 0;
-     unsigned int i;
-     u16 ub_size;
-
-     ub_size = ops->get_ub_size(vfe->id);
-     if (!ub_size)
-             return -EINVAL;
-
-     sensor = camss_find_sensor(&line->subdev.entity);
-     if (sensor) {
-             struct v4l2_subdev *subdev =
-                                     media_entity_to_v4l2_subdev(sensor);
-
-             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
-             /* Max frame skip is 29 frames */
-             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
-                     frame_skip = VFE_FRAME_DROP_VAL - 1;
-     }
-
-     spin_lock_irqsave(&vfe->output_lock, flags);
-
-     ops->reg_update_clear(vfe, line->id);
-
-     if (output->state != VFE_OUTPUT_RESERVED) {
-             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
-                     output->state);
-             spin_unlock_irqrestore(&vfe->output_lock, flags);
-             return -EINVAL;
-     }
-     output->state = VFE_OUTPUT_IDLE;
-
-     output->buf[0] = vfe_buf_get_pending(output);
-     output->buf[1] = vfe_buf_get_pending(output);
-
-     if (!output->buf[0] && output->buf[1]) {
-             output->buf[0] = output->buf[1];
-             output->buf[1] = NULL;
-     }
-
-     if (output->buf[0])
-             output->state = VFE_OUTPUT_SINGLE;
-
-     if (output->buf[1])
-             output->state = VFE_OUTPUT_CONTINUOUS;
-
-     switch (output->state) {
-     case VFE_OUTPUT_SINGLE:
-             vfe_output_frame_drop(vfe, output, 1 << frame_skip);
-             break;
-     case VFE_OUTPUT_CONTINUOUS:
-             vfe_output_frame_drop(vfe, output, 3 << frame_skip);
-             break;
-     default:
-             vfe_output_frame_drop(vfe, output, 0);
-             break;
-     }
-
-     output->sequence = 0;
-     output->wait_sof = 0;
-     output->wait_reg_update = 0;
-     reinit_completion(&output->sof);
-     reinit_completion(&output->reg_update);
-
-     vfe_output_init_addrs(vfe, output, 0);
-
-     if (line->id != VFE_LINE_PIX) {
-             ops->set_cgc_override(vfe, output->wm_idx[0], 1);
-             ops->enable_irq_wm_line(vfe, output->wm_idx[0], line->id, 1);
-             ops->bus_connect_wm_to_rdi(vfe, output->wm_idx[0], line->id);
-             ops->wm_set_subsample(vfe, output->wm_idx[0]);
-             ops->set_rdi_cid(vfe, line->id, 0);
-             ops->wm_set_ub_cfg(vfe, output->wm_idx[0],
-                                (ub_size + 1) * output->wm_idx[0], ub_size);
-             ops->wm_frame_based(vfe, output->wm_idx[0], 1);
-             ops->wm_enable(vfe, output->wm_idx[0], 1);
-             ops->bus_reload_wm(vfe, output->wm_idx[0]);
-     } else {
-             ub_size /= output->wm_num;
-             for (i = 0; i < output->wm_num; i++) {
-                     ops->set_cgc_override(vfe, output->wm_idx[i], 1);
-                     ops->wm_set_subsample(vfe, output->wm_idx[i]);
-                     ops->wm_set_ub_cfg(vfe, output->wm_idx[i],
-                                        (ub_size + 1) * output->wm_idx[i],
-                                        ub_size);
-                     ops->wm_line_based(vfe, output->wm_idx[i],
-                                     &line->video_out.active_fmt.fmt.pix_mp,
-                                     i, 1);
-                     ops->wm_enable(vfe, output->wm_idx[i], 1);
-                     ops->bus_reload_wm(vfe, output->wm_idx[i]);
-             }
-             ops->enable_irq_pix_line(vfe, 0, line->id, 1);
-             ops->set_module_cfg(vfe, 1);
-             ops->set_camif_cfg(vfe, line);
-             ops->set_realign_cfg(vfe, line, 1);
-             ops->set_xbar_cfg(vfe, output, 1);
-             ops->set_demux_cfg(vfe, line);
-             ops->set_scale_cfg(vfe, line);
-             ops->set_crop_cfg(vfe, line);
-             ops->set_clamp_cfg(vfe);
-             ops->set_camif_cmd(vfe, 1);
-     }
-
-     ops->reg_update(vfe, line->id);
-
-     spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-     return 0;
-}
-
-static int vfe_disable_output(struct vfe_line *line)
-{
-     struct vfe_device *vfe = to_vfe(line);
-     struct vfe_output *output = &line->output;
-     const struct vfe_hw_ops *ops = vfe->ops;
-     unsigned long flags;
-     unsigned long time;
-     unsigned int i;
-
-     spin_lock_irqsave(&vfe->output_lock, flags);
-
-     output->wait_sof = 1;
-     spin_unlock_irqrestore(&vfe->output_lock, flags);
-
-     time = wait_for_completion_timeout(&output->sof,
-                                        msecs_to_jiffies(VFE_NEXT_SOF_MS));
-     if (!time)
-             dev_err(vfe->camss->dev, "VFE sof timeout\n");
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/camss/camss-vfe.h +68 -53
index 5bce6736e4bb..aad5dc74c2c0 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/qcom/camss/camss.c +2 -2
index 5ac2dfc67c8b..6c6f1e59ccd8 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#14 lore raw

PATCH v5 7/22 media: camss: Add support for VFE hardware version Titan 170

In reply to Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

 drivers/media/platform/qcom/camss/Makefile    |   1 +
 .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
 drivers/media/platform/qcom/camss/camss-vfe.c |  47 +-
 drivers/media/platform/qcom/camss/camss-vfe.h |  26 +-
 .../media/platform/qcom/camss/camss-video.c   |  52 ++
 drivers/media/platform/qcom/camss/camss.c     |  61 ++
 6 files changed, 957 insertions(+), 20 deletions(-)
 create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
 		camss-vfe-4-1.o \
 		camss-vfe-4-7.o \
 		camss-vfe-4-8.o \
+		camss-vfe-170.o \
 		camss-vfe-gen1.o \
 		camss-vfe.o \
 		camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +790 -0

790 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe.c +38 -9

83 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
 #include "camss-video.h"
 #include "camss-vfe-gen1.h"
 
-
 #define MSM_VFE_PAD_SINK 0
 #define MSM_VFE_PAD_SRC 1
 #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
 #define to_vfe(ptr_line)	\
 	container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
 enum vfe_output_state {
 	VFE_OUTPUT_OFF,
 	VFE_OUTPUT_RESERVED,
 	VFE_OUTPUT_SINGLE,
 	VFE_OUTPUT_CONTINUOUS,
 	VFE_OUTPUT_IDLE,
-	VFE_OUTPUT_STOPPING
+	VFE_OUTPUT_STOPPING,
+	VFE_OUTPUT_ON,
 };
 
 enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
 	VFE_LINE_RDI0 = 0,
 	VFE_LINE_RDI1 = 1,
 	VFE_LINE_RDI2 = 2,
+	VFE_LINE_NUM_GEN2 = 3,
 	VFE_LINE_PIX = 3,
 	VFE_LINE_NUM_GEN1 = 4,
 	VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
 			int active_buf;
 			int wait_sof;
 		} gen1;
+		struct {
+			int active_num;
+		} gen2;
 	};
 	enum vfe_output_state state;
 	unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
 struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
 int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
 /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
 int vfe_release_wm(struct vfe_device *vfe, u8 wm);
 int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
 extern const struct vfe_hw_ops vfe_ops_4_1;
 extern const struct vfe_hw_ops vfe_ops_4_7;
 extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
 #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0

64 lines not on this page · raw message

drivers/media/platform/qcom/camss/camss.c +61 -0

67 lines not on this page · raw message

Signature · 1 line
2.27.0
#15 lore raw

Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170

Hi Robert,

Thank you for your patch!

Quoted 54 lines · Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

  drivers/media/platform/qcom/camss/Makefile    |   1 +
  .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
  drivers/media/platform/qcom/camss/camss-vfe.c |  47 +-
  drivers/media/platform/qcom/camss/camss-vfe.h |  26 +-
  .../media/platform/qcom/camss/camss-video.c   |  52 ++
  drivers/media/platform/qcom/camss/camss.c     |  61 ++
  6 files changed, 957 insertions(+), 20 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c

drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
  		camss-vfe-4-1.o \
  		camss-vfe-4-7.o \
  		camss-vfe-4-8.o \
+		camss-vfe-170.o \
  		camss-vfe-gen1.o \
  		camss-vfe.o \
  		camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +0 -0
new file mode 100644
index 000000000000..c4991b1f22f8

drivers/media/platform/qcom/camss/camss-vfe-170.c line 8

Quoted 8 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +8 -0
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.

- it looks like the header comes from v4.7 without updating to Titan 170

Quoted 215 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +215 -0
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION				(0x000)
+
+#define VFE_GLOBAL_RESET_CMD			(0x018)
+#define		GLOBAL_RESET_CMD_CORE		BIT(0)
+#define		GLOBAL_RESET_CMD_CAMIF		BIT(1)
+#define		GLOBAL_RESET_CMD_BUS		BIT(2)
+#define		GLOBAL_RESET_CMD_BUS_BDG	BIT(3)
+#define		GLOBAL_RESET_CMD_REGISTER	BIT(4)
+#define		GLOBAL_RESET_CMD_PM		BIT(5)
+#define		GLOBAL_RESET_CMD_BUS_MISR	BIT(6)
+#define		GLOBAL_RESET_CMD_TESTGEN	BIT(7)
+#define		GLOBAL_RESET_CMD_DSP		BIT(8)
+#define		GLOBAL_RESET_CMD_IDLE_CGC	BIT(9)
+#define		GLOBAL_RESET_CMD_RDI0		BIT(10)
+#define		GLOBAL_RESET_CMD_RDI1		BIT(11)
+#define		GLOBAL_RESET_CMD_RDI2		BIT(12)
+#define		GLOBAL_RESET_CMD_RDI3		BIT(13)
+#define		GLOBAL_RESET_CMD_VFE_DOMAIN	BIT(30)
+#define		GLOBAL_RESET_CMD_RESET_BYPASS	BIT(31)
+
+
+#define VFE_CORE_CFG				(0x050)
+#define		CFG_PIXEL_PATTERN_YCBYCR	(0x4)
+#define		CFG_PIXEL_PATTERN_YCRYCB	(0x5)
+#define		CFG_PIXEL_PATTERN_CBYCRY	(0x6)
+#define		CFG_PIXEL_PATTERN_CRYCBY	(0x7)
+#define		CFG_COMPOSITE_REG_UPDATE_EN	BIT(4)
+
+#define VFE_IRQ_CMD				(0x058)
+#define		CMD_GLOBAL_CLEAR		BIT(0)
+
+#define VFE_IRQ_MASK_0					(0x05c)
+#define		MASK_0_CAMIF_SOF			BIT(0)
+#define		MASK_0_CAMIF_EOF			BIT(1)
+#define		MASK_0_RDI_REG_UPDATE(n)		BIT((n) + 5)
+#define		MASK_0_IMAGE_MASTER_n_PING_PONG(n)	BIT((n) + 8)
+#define		MASK_0_IMAGE_COMPOSITE_DONE_n(n)	BIT((n) + 25)
+#define		MASK_0_RESET_ACK			BIT(31)
+
+#define VFE_IRQ_MASK_1					(0x060)
+#define		MASK_1_CAMIF_ERROR			BIT(0)
+#define		MASK_1_VIOLATION			BIT(7)
+#define		MASK_1_BUS_BDG_HALT_ACK			BIT(8)
+#define		MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)	BIT((n) + 9)
+#define		MASK_1_RDI_SOF(n)			BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0					(0x064)
+#define VFE_IRQ_CLEAR_1					(0x068)
+
+#define VFE_IRQ_STATUS_0				(0x06c)
+#define		STATUS_0_CAMIF_SOF			BIT(0)
+#define		STATUS_0_RDI_REG_UPDATE(n)		BIT((n) + 5)
+#define		STATUS_0_IMAGE_MASTER_PING_PONG(n)	BIT((n) + 8)
+#define		STATUS_0_IMAGE_COMPOSITE_DONE(n)	BIT((n) + 25)
+#define		STATUS_0_RESET_ACK			BIT(31)
+
+#define VFE_IRQ_STATUS_1				(0x070)
+#define		STATUS_1_VIOLATION			BIT(7)
+#define		STATUS_1_BUS_BDG_HALT_ACK		BIT(8)
+#define		STATUS_1_RDI_SOF(n)			BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS			(0x07c)
+
+#define VFE_CAMIF_CMD				(0x478)
+#define		CMD_CLEAR_CAMIF_STATUS		BIT(2)
+
+#define VFE_CAMIF_CFG				(0x47c)
+#define		CFG_VSYNC_SYNC_EDGE		(0)
+#define			VSYNC_ACTIVE_HIGH	(0)
+#define			VSYNC_ACTIVE_LOW	(1)
+#define		CFG_HSYNC_SYNC_EDGE		(1)
+#define			HSYNC_ACTIVE_HIGH	(0)
+#define			HSYNC_ACTIVE_LOW	(1)
+#define		CFG_VFE_SUBSAMPLE_ENABLE	BIT(4)
+#define		CFG_BUS_SUBSAMPLE_ENABLE	BIT(5)
+#define		CFG_VFE_OUTPUT_EN		BIT(6)
+#define		CFG_BUS_OUTPUT_EN		BIT(7)
+#define		CFG_BINNING_EN			BIT(9)
+#define		CFG_FRAME_BASED_EN		BIT(10)
+#define		CFG_RAW_CROP_EN			BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG			0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG		0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG		0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG		0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN	0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN	0x49c
+#define VFE_0_CAMIF_STATUS			0x4a4
+#define VFE_0_CAMIF_STATUS_HALT			BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD			(0x4ac)
+#define		REG_UPDATE_RDI(n)		BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n)		(0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n)		(0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n)		(0x205c + (n) * 4)
+#define		STATUS0_COMP_RESET_DONE		BIT(0)
+#define		STATUS0_COMP_REG_UPDATE0_DONE	BIT(1)
+#define		STATUS0_COMP_REG_UPDATE1_DONE	BIT(2)
+#define		STATUS0_COMP_REG_UPDATE2_DONE	BIT(3)
+#define		STATUS0_COMP_REG_UPDATE3_DONE	BIT(4)
+#define		STATUS0_COMP_REG_UPDATE_DONE(n)	BIT(n + 1)
+#define		STATUS0_COMP0_BUF_DONE		BIT(5)
+#define		STATUS0_COMP1_BUF_DONE		BIT(6)
+#define		STATUS0_COMP2_BUF_DONE		BIT(7)
+#define		STATUS0_COMP3_BUF_DONE		BIT(8)
+#define		STATUS0_COMP4_BUF_DONE		BIT(9)
+#define		STATUS0_COMP5_BUF_DONE		BIT(10)
+#define		STATUS0_COMP_BUF_DONE(n)	BIT(n + 5)
+#define		STATUS0_COMP_ERROR		BIT(11)
+#define		STATUS0_COMP_OVERWRITE		BIT(12)
+#define		STATUS0_OVERFLOW		BIT(13)
+#define		STATUS0_VIOLATION		BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define		STATUS1_WM_CLIENT_BUF_DONE(n)		BIT(n)
+#define		STATUS1_EARLY_DONE			BIT(24)
+#define		STATUS2_DUAL_COMP0_BUF_DONE		BIT(0)
+#define		STATUS2_DUAL_COMP1_BUF_DONE		BIT(1)
+#define		STATUS2_DUAL_COMP2_BUF_DONE		BIT(2)
+#define		STATUS2_DUAL_COMP3_BUF_DONE		BIT(3)
+#define		STATUS2_DUAL_COMP4_BUF_DONE		BIT(4)
+#define		STATUS2_DUAL_COMP5_BUF_DONE		BIT(5)
+#define		STATUS2_DUAL_COMP_BUF_DONE(n)		BIT(n)
+#define		STATUS2_DUAL_COMP_ERROR			BIT(6)
+#define		STATUS2_DUAL_COMP_OVERWRITE		BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL		(0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG		(0x226c)
+#define		DEBUG_STATUS_CFG_STATUS0(n)	BIT(n)
+#define		DEBUG_STATUS_CFG_STATUS1(n)	BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER	(0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC		(0x2084)
+#define		BUS_VER2_MAX_CLIENTS (24)
+#define		WM_ADDR_NO_SYNC_DEFAULT_VAL \
+				((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE			(0x200c)
+#define		WM_CGC_OVERRIDE_ALL		(0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL		(0x211c)
+
+#define VFE_BUS_WM_STATUS0(n)			(0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n)			(0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n)			(0x2208 + (n) * 0x100)
+#define		WM_CFG_EN			(0)
+#define		WM_CFG_MODE			(1)
+#define			MODE_QCOM_PLAIN	(0)
+#define			MODE_MIPI_RAW	(1)
+#define		WM_CFG_VIRTUALFRAME		(2)
+#define VFE_BUS_WM_HEADER_ADDR(n)		(0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n)		(0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n)		(0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n)		(0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n)		(0x221c + (n) * 0x100)
+#define		WM_BUFFER_DEFAULT_WIDTH		(0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n)		(0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n)		(0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n)			(0x2228 + (n) * 0x100)
+#define		WM_STRIDE_DEFAULT_STRIDE	(0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n)	(0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n)	(0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n)		(0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n)		(0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n)			(0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n)		(0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+	u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+	u32 gen = (hw_version >> 28) & 0xF;
+	u32 rev = (hw_version >> 16) & 0xFFF;
+	u32 step = hw_version & 0xFFFF;
+
+	dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+	u32 bits = readl_relaxed(vfe->base + reg);
+
+	writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+	u32 bits = readl_relaxed(vfe->base + reg);
+
+	writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{

drivers/media/platform/qcom/camss/camss-vfe-170.c line 233

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+	u32 reset_bits = GLOBAL_RESET_CMD_CORE		|
+			 GLOBAL_RESET_CMD_CAMIF		|
+			 GLOBAL_RESET_CMD_BUS		|
+			 GLOBAL_RESET_CMD_REGISTER	|
+			 GLOBAL_RESET_CMD_PM		|
+			 GLOBAL_RESET_CMD_BUS_MISR	|
+			 GLOBAL_RESET_CMD_IDLE_CGC	|
+			 GLOBAL_RESET_CMD_RDI0		|
+			 GLOBAL_RESET_CMD_RDI1		|
+			 GLOBAL_RESET_CMD_RDI2;

- so the reset_bits is set to 0x00001E77 in v5.

In v4 the reset_bits was set to 0x00003F9F which corresponds to:

	GLOBAL_RESET_CMD_CORE		|
	GLOBAL_RESET_CMD_CAMIF		|
	GLOBAL_RESET_CMD_BUS		|
	GLOBAL_RESET_CMD_BUS_BDG	|
	GLOBAL_RESET_CMD_REGISTER	|
	GLOBAL_RESET_CMD_TESTGEN	|
	GLOBAL_RESET_CMD_DSP		|
	GLOBAL_RESET_CMD_IDLE_CGC	|
	GLOBAL_RESET_CMD_RDI0		|
	GLOBAL_RESET_CMD_RDI1		|
	GLOBAL_RESET_CMD_RDI2		|
	GLOBAL_RESET_CMD_RDI3;

So the difference between v4 and v5 is:

reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP

reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR

- correct?

It is probably worth a few words in the v4 vs v5 changelog.

(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2 according to the driver code)

Quoted 87 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +87 -0
+
+	writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+	/* Make sure IRQ mask has been written before resetting */
+	wmb();
+
+	writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+	u32 val;
+
+	/*Set Debug Registers*/
+	val = DEBUG_STATUS_CFG_STATUS0(1) |
+	      DEBUG_STATUS_CFG_STATUS0(7);
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+	/* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+	writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+	/* no clock gating at bus input */
+	val = WM_CGC_OVERRIDE_ALL;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+	writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+	/* if addr_no_sync has default value then config the addr no sync reg */
+	val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+	writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+	val = WM_BUFFER_DEFAULT_WIDTH;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+	val = 0;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+	val = 0;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+	/* Configure stride for RDIs */
+	//val = pix->plane_fmt[0].bytesperline;
+	val = WM_STRIDE_DEFAULT_STRIDE;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+	/* Enable WM */
+	val = 1 << WM_CFG_EN |
+	      MODE_MIPI_RAW << WM_CFG_MODE;
+	writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+	/* Disable WM */
+	writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+			  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;
+
+	writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+	writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+	vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+	/* Enforce ordering between previous reg writes and reg update */
+	wmb();
+
+	writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+	/* Enforce ordering between reg update and subsequent reg writes */
+	wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+					enum vfe_line_id line_id)
+{
+	vfe->reg_update &= ~REG_UPDATE_RDI(line_id);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 330

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+	vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+	vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+	writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+	writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+	writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));

Looking at the #defines in the beginning of this file, only part of the IRQ sources (not the whole 32 per each register) are used or defined.

Is it safe to unmask the unused (reserved?) bits in the above 5 IRQ mask registers?

Quoted 113 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +113 -0
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+	complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+	*status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+	*status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+	writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+	writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+	/* Enforce ordering between IRQ Clear and Global IRQ Clear */
+	wmb();
+	writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+	u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+	pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+	struct vfe_device *vfe = dev;
+	u32 status0, status1, vfe_bus_status[3];
+	int i, wm;
+
+	status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+	status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+	writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+	writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+	for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+		vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+		writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+	}
+
+	/* Enforce ordering between IRQ reading and interpretation */
+	wmb();
+
+	writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+	writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+	if (status0 & STATUS_0_RESET_ACK)
+		vfe->isr_ops.reset_ack(vfe);
+
+	for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+		if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+			vfe->isr_ops.reg_update(vfe, i);
+
+	for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+		if (status0 & STATUS_1_RDI_SOF(i))
+			vfe->isr_ops.sof(vfe, i);
+
+	for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+		if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+			vfe->isr_ops.comp_done(vfe, i);
+
+	for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+		if (status0 & BIT(9))
+			if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+				vfe->isr_ops.wm_done(vfe, wm);
+
+	return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+	unsigned long time;
+
+	return 0;
+
+	reinit_completion(&vfe->halt_complete);
+
+	time = wait_for_completion_timeout(&vfe->halt_complete,
+		msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+	if (!time) {
+		dev_err(vfe->camss->dev, "VFE halt timeout\n");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output;
+	unsigned long flags;
+	int i;
+	int wm_idx;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 453

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+
+	output = &line->output;
+	if (output->state != VFE_OUTPUT_OFF) {
+		dev_err(vfe->camss->dev, "Output is running\n");
+		goto error;
+	}
+
+	output->wm_num = 1;
+
+	for (i = 0; i < output->wm_num; i++) {

- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+		wm_idx = vfe_reserve_wm(vfe, line->id);
+		if (wm_idx < 0) {
+			dev_err(vfe->camss->dev, "Can not reserve wm\n");
+			goto error_get_wm;
+		}
+		output->wm_idx[i] = wm_idx;

drivers/media/platform/qcom/camss/camss-vfe-170.c line 469

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+	}
+
+	output->drop_update_idx = 0;
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+
+error_get_wm:
+	for (i--; i >= 0; i--)

- ... and this one too. And the "i" local var is no longer needed.

Thanks,
Andrey

Quoted 637 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +321 -0
+		vfe_release_wm(vfe, output->wm_idx[i]);
+	output->state = VFE_OUTPUT_OFF;
+error:
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output = &line->output;
+	const struct vfe_hw_ops *ops = vfe->ops;
+	struct media_entity *sensor;
+	unsigned long flags;
+	unsigned int frame_skip = 0;
+	unsigned int i;
+
+	sensor = camss_find_sensor(&line->subdev.entity);
+	if (sensor) {
+		struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+		v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+		/* Max frame skip is 29 frames */
+		if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+			frame_skip = VFE_FRAME_DROP_VAL - 1;
+	}
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	ops->reg_update_clear(vfe, line->id);
+
+	if (output->state != VFE_OUTPUT_OFF) {
+		dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+			output->state);
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+		return -EINVAL;
+	}
+
+	WARN_ON(output->gen2.active_num);
+
+	output->state = VFE_OUTPUT_ON;
+
+	output->sequence = 0;
+	output->wait_reg_update = 0;
+	reinit_completion(&output->reg_update);
+
+	vfe_wm_start(vfe, output->wm_idx[0], line);
+
+	for (i = 0; i < 2; i++) {
+		output->buf[i] = vfe_buf_get_pending(output);
+		if (!output->buf[i])
+			break;
+		output->gen2.active_num++;
+		vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+	}
+
+	ops->reg_update(vfe, line->id);
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output = &line->output;
+	unsigned long flags;
+	unsigned int i;
+	bool done;
+	int timeout = 0;
+
+	do {
+		spin_lock_irqsave(&vfe->output_lock, flags);
+		done = !output->gen2.active_num;
+		spin_unlock_irqrestore(&vfe->output_lock, flags);
+		usleep_range(10000, 20000);
+
+		if (timeout++ == 100) {
+			dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+			vfe_reset(vfe);
+			output->gen2.active_num = 0;
+			return 0;
+		}
+	} while (!done);
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+	for (i = 0; i < output->wm_num; i++)
+		vfe_wm_stop(vfe, output->wm_idx[i]);
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+	int ret;
+
+	mutex_lock(&vfe->stream_lock);
+
+	if (!vfe->stream_count)
+		vfe_enable_irq_common(vfe);
+
+	vfe->stream_count++;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	ret = vfe_get_output(line);
+	if (ret < 0)
+		goto error_get_output;
+
+	ret = vfe_enable_output(line);
+	if (ret < 0)
+		goto error_enable_output;
+
+	vfe->was_streaming = 1;
+
+	return 0;
+
+
+error_enable_output:
+	vfe_put_output(line);
+
+error_get_output:
+	mutex_lock(&vfe->stream_lock);
+
+	vfe->stream_count--;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+	struct vfe_device *vfe = to_vfe(line);
+
+	vfe_disable_output(line);
+
+	vfe_put_output(line);
+
+	mutex_lock(&vfe->stream_lock);
+
+	vfe->stream_count--;
+
+	mutex_unlock(&vfe->stream_lock);
+
+	return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+	struct vfe_output *output;
+	unsigned long flags;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+	vfe->ops->reg_update_clear(vfe, line_id);
+
+	output = &vfe->line[line_id].output;
+
+	if (output->wait_reg_update) {
+		output->wait_reg_update = 0;
+		complete(&output->reg_update);
+	}
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+	struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+	struct camss_buffer *ready_buf;
+	struct vfe_output *output;
+	unsigned long flags;
+	u32 index;
+	u64 ts = ktime_get_ns();
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Received wm done for unmapped index\n");
+		goto out_unlock;
+	}
+	output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+	ready_buf = output->buf[0];
+	if (!ready_buf) {
+		dev_err_ratelimited(vfe->camss->dev,
+				    "Missing ready buf %d!\n", output->state);
+		goto out_unlock;
+	}
+
+	ready_buf->vb.vb2_buf.timestamp = ts;
+	ready_buf->vb.sequence = output->sequence++;
+
+	index = 0;
+	output->buf[0] = output->buf[1];
+	if (output->buf[0])
+		index = 1;
+
+	output->buf[index] = vfe_buf_get_pending(output);
+
+	if (output->buf[index])
+		vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+	else
+		output->gen2.active_num--;
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+	return;
+
+out_unlock:
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+			    struct camss_buffer *buf)
+{
+	struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+	struct vfe_device *vfe = to_vfe(line);
+	struct vfe_output *output;
+	unsigned long flags;
+
+	output = &line->output;
+
+	spin_lock_irqsave(&vfe->output_lock, flags);
+
+	if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+		output->buf[output->gen2.active_num++] = buf;
+		vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+	} else {
+		vfe_buf_add_pending(output, buf);
+	}
+
+	spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+	return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+	.reset_ack = vfe_isr_reset_ack,
+	.halt_ack = vfe_isr_halt_ack,
+	.reg_update = vfe_isr_reg_update,
+	.sof = vfe_isr_sof,
+	.comp_done = vfe_isr_comp_done,
+	.wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+	.queue_buffer = vfe_queue_buffer,
+	.flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+	vfe->isr_ops = vfe_isr_ops_170;
+	vfe->video_ops = vfe_video_ops_170;
+
+	vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+	.global_reset = vfe_global_reset,
+	.hw_version_read = vfe_hw_version_read,
+	.isr_read = vfe_isr_read,
+	.isr = vfe_isr,
+	.reg_update_clear = vfe_reg_update_clear,
+	.reg_update = vfe_reg_update,
+	.subdev_init = vfe_subdev_init,
+	.vfe_disable = vfe_disable,
+	.vfe_enable = vfe_enable,
+	.vfe_halt = vfe_halt,
+	.violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe.c +38 -9
index 375843bd16af..6fafeb8a5484 100644
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
  	{ MEDIA_BUS_FMT_YVYU8_2X8, 8 },
  };
 
+static const struct vfe_format formats_rdi_845[] = {
+	{ MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+	{ MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+	{ MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+	{ MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+	{ MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+	{ MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+	{ MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+	{ MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+	{ MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+	{ MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+	{ MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+	{ MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+	{ MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+	{ MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+	{ MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+	{ MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+	{ MEDIA_BUS_FMT_Y10_1X10, 10 },
+	{ MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
  /*
   * vfe_get_bpp - map media bus format to bits per pixel
   * @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
  			return sink_code;
  		}
  	else if (vfe->camss->version == CAMSS_8x96 ||
-		 vfe->camss->version == CAMSS_660)
+		 vfe->camss->version == CAMSS_660 ||
+		 vfe->camss->version == CAMSS_845)
  		switch (sink_code) {
  		case MEDIA_BUS_FMT_YUYV8_2X8:
  		{
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
  		return 0;
  }
 
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
  {
  	unsigned long time;
 
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
  		struct camss_clock *clock = &vfe->clock[i];
 
  		if (!strcmp(clock->name, "vfe0") ||
-		    !strcmp(clock->name, "vfe1")) {
+		    !strcmp(clock->name, "vfe1") ||
+		    !strcmp(clock->name, "vfe_lite")) {
  			u64 min_rate = 0;
  			long rate;
 
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
  	case CAMSS_660:
  		vfe->ops = &vfe_ops_4_8;
  		break;
+
+	case CAMSS_845:
+		vfe->ops = &vfe_ops_170;
+		break;
  	default:
  		return -EINVAL;
  	}
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
  				l->formats = formats_rdi_8x96;
  				l->nformats = ARRAY_SIZE(formats_rdi_8x96);
  			}
+		} else if (camss->version == CAMSS_845) {
+			l->formats = formats_rdi_845;
+			l->nformats = ARRAY_SIZE(formats_rdi_845);
  		} else {
  			return -EINVAL;
  		}
drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
  #include "camss-video.h"
  #include "camss-vfe-gen1.h"
 
-
  #define MSM_VFE_PAD_SINK 0
  #define MSM_VFE_PAD_SRC 1
  #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
  #define to_vfe(ptr_line)	\
  	container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
  enum vfe_output_state {
  	VFE_OUTPUT_OFF,
  	VFE_OUTPUT_RESERVED,
  	VFE_OUTPUT_SINGLE,
  	VFE_OUTPUT_CONTINUOUS,
  	VFE_OUTPUT_IDLE,
-	VFE_OUTPUT_STOPPING
+	VFE_OUTPUT_STOPPING,
+	VFE_OUTPUT_ON,
  };
 
  enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
  	VFE_LINE_RDI0 = 0,
  	VFE_LINE_RDI1 = 1,
  	VFE_LINE_RDI2 = 2,
+	VFE_LINE_NUM_GEN2 = 3,
  	VFE_LINE_PIX = 3,
  	VFE_LINE_NUM_GEN1 = 4,
  	VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
  			int active_buf;
  			int wait_sof;
  		} gen1;
+		struct {
+			int active_num;
+		} gen2;
  	};
  	enum vfe_output_state state;
  	unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
  struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
  int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
  /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
  int vfe_release_wm(struct vfe_device *vfe, u8 wm);
  int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
  extern const struct vfe_hw_ops vfe_ops_4_1;
  extern const struct vfe_hw_ops vfe_ops_4_7;
  extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
  #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0
index 97cea7c4d769..f282275af626 100644
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
  	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
  };
 
+static const struct camss_format_info formats_rdi_845[] = {
+	{ MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+	{ MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+	{ MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+	{ MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+	{ MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+	{ MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+	{ MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+	{ MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+	{ MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+	{ MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+	{ MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+	{ MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+	{ MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+	{ MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+	{ MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+	{ MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+	{ MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+	{ MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+	{ MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+	{ MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+	{ MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+	{ MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+	  { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
  static const struct camss_format_info formats_pix_8x16[] = {
  	{ MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
  	  { { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
  			video->formats = formats_rdi_8x96;
  			video->nformats = ARRAY_SIZE(formats_rdi_8x96);
  		}
+	}  else if (video->camss->version == CAMSS_845) {
+		video->formats = formats_rdi_845;
+		video->nformats = ARRAY_SIZE(formats_rdi_845);
  	} else {
  		ret = -EINVAL;
  		goto error_video_register;
drivers/media/platform/qcom/camss/camss.c +61 -0
index 6c6f1e59ccd8..0e006def1996 100644
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
  	}
  };
 
+static const struct resources vfe_res_845[] = {
+	/* VFE0 */
+	{
+		.regulator = { NULL },
+		.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+				"soc_ahb", "vfe0", "vfe0_axi",
+				"vfe0_src", "csi0",
+				"csi0_src"},
+		.clock_rate = { { 0 },
+				{ 0 },
+				{ 80000000 },
+				{ 0 },
+				{ 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+				{ 0 },
+				{ 320000000 },
+				{ 19200000, 75000000, 384000000, 538666667 },
+				{ 384000000 } },
+		.reg = { "vfe0" },
+		.interrupt = { "vfe0" }
+	},
+
+	/* VFE1 */
+	{
+		.regulator = { NULL },
+		.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+				"soc_ahb", "vfe1", "vfe1_axi",
+				"vfe1_src", "csi1",
+				"csi1_src"},
+		.clock_rate = { { 0 },
+				{ 0 },
+				{ 80000000 },
+				{ 0 },
+				{ 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+				{ 0 },
+				{ 320000000 },
+				{ 19200000, 75000000, 384000000, 538666667 },
+				{ 384000000 } },
+		.reg = { "vfe1" },
+		.interrupt = { "vfe1" }
+	},
+
+	/* VFE-lite */
+	{
+		.regulator = { NULL },
+		.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+				"soc_ahb", "vfe_lite",
+				"vfe_lite_src", "csi2",
+				"csi2_src"},
+		.clock_rate = { { 0 },
+				{ 0 },
+				{ 80000000 },
+				{ 0 },
+				{ 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+				{ 320000000 },
+				{ 19200000, 75000000, 384000000, 538666667 },
+				{ 384000000 } },
+		.reg = { "vfe_lite" },
+		.interrupt = { "vfe_lite" }
+	}
+};
+
  /*
   * camss_add_clock_margin - Add margin to clock frequency rate
   * @rate: Clock frequency rate
#16 lore raw

Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170

Quoted 62 lines · Andrey Konovalov

Hi Robert,

Thank you for your patch!

Quoted 56 lines · Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

  drivers/media/platform/qcom/camss/Makefile    |   1 +
  .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
  drivers/media/platform/qcom/camss/camss-vfe.c |  47 +-
  drivers/media/platform/qcom/camss/camss-vfe.h |  26 +-
  .../media/platform/qcom/camss/camss-video.c   |  52 ++
  drivers/media/platform/qcom/camss/camss.c     |  61 ++
  6 files changed, 957 insertions(+), 20 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c

drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
              camss-vfe-4-1.o \
              camss-vfe-4-7.o \
              camss-vfe-4-8.o \
+             camss-vfe-170.o \
              camss-vfe-gen1.o \
              camss-vfe.o \
              camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +2 -0
new file mode 100644
index 000000000000..c4991b1f22f8
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 8

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.

- it looks like the header comes from v4.7 without updating to Titan 170

Gotcha, thanks!

Quoted 255 lines
Quoted 216 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +215 -0
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION                               (0x000)
+
+#define VFE_GLOBAL_RESET_CMD                 (0x018)
+#define              GLOBAL_RESET_CMD_CORE           BIT(0)
+#define              GLOBAL_RESET_CMD_CAMIF          BIT(1)
+#define              GLOBAL_RESET_CMD_BUS            BIT(2)
+#define              GLOBAL_RESET_CMD_BUS_BDG        BIT(3)
+#define              GLOBAL_RESET_CMD_REGISTER       BIT(4)
+#define              GLOBAL_RESET_CMD_PM             BIT(5)
+#define              GLOBAL_RESET_CMD_BUS_MISR       BIT(6)
+#define              GLOBAL_RESET_CMD_TESTGEN        BIT(7)
+#define              GLOBAL_RESET_CMD_DSP            BIT(8)
+#define              GLOBAL_RESET_CMD_IDLE_CGC       BIT(9)
+#define              GLOBAL_RESET_CMD_RDI0           BIT(10)
+#define              GLOBAL_RESET_CMD_RDI1           BIT(11)
+#define              GLOBAL_RESET_CMD_RDI2           BIT(12)
+#define              GLOBAL_RESET_CMD_RDI3           BIT(13)
+#define              GLOBAL_RESET_CMD_VFE_DOMAIN     BIT(30)
+#define              GLOBAL_RESET_CMD_RESET_BYPASS   BIT(31)
+
+
+#define VFE_CORE_CFG                         (0x050)
+#define              CFG_PIXEL_PATTERN_YCBYCR        (0x4)
+#define              CFG_PIXEL_PATTERN_YCRYCB        (0x5)
+#define              CFG_PIXEL_PATTERN_CBYCRY        (0x6)
+#define              CFG_PIXEL_PATTERN_CRYCBY        (0x7)
+#define              CFG_COMPOSITE_REG_UPDATE_EN     BIT(4)
+
+#define VFE_IRQ_CMD                          (0x058)
+#define              CMD_GLOBAL_CLEAR                BIT(0)
+
+#define VFE_IRQ_MASK_0                                       (0x05c)
+#define              MASK_0_CAMIF_SOF                        BIT(0)
+#define              MASK_0_CAMIF_EOF                        BIT(1)
+#define              MASK_0_RDI_REG_UPDATE(n)                BIT((n) + 5)
+#define              MASK_0_IMAGE_MASTER_n_PING_PONG(n)      BIT((n) + 8)
+#define              MASK_0_IMAGE_COMPOSITE_DONE_n(n)        BIT((n) + 25)
+#define              MASK_0_RESET_ACK                        BIT(31)
+
+#define VFE_IRQ_MASK_1                                       (0x060)
+#define              MASK_1_CAMIF_ERROR                      BIT(0)
+#define              MASK_1_VIOLATION                        BIT(7)
+#define              MASK_1_BUS_BDG_HALT_ACK                 BIT(8)
+#define              MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)   BIT((n) + 9)
+#define              MASK_1_RDI_SOF(n)                       BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0                                      (0x064)
+#define VFE_IRQ_CLEAR_1                                      (0x068)
+
+#define VFE_IRQ_STATUS_0                             (0x06c)
+#define              STATUS_0_CAMIF_SOF                      BIT(0)
+#define              STATUS_0_RDI_REG_UPDATE(n)              BIT((n) + 5)
+#define              STATUS_0_IMAGE_MASTER_PING_PONG(n)      BIT((n) + 8)
+#define              STATUS_0_IMAGE_COMPOSITE_DONE(n)        BIT((n) + 25)
+#define              STATUS_0_RESET_ACK                      BIT(31)
+
+#define VFE_IRQ_STATUS_1                             (0x070)
+#define              STATUS_1_VIOLATION                      BIT(7)
+#define              STATUS_1_BUS_BDG_HALT_ACK               BIT(8)
+#define              STATUS_1_RDI_SOF(n)                     BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS                 (0x07c)
+
+#define VFE_CAMIF_CMD                                (0x478)
+#define              CMD_CLEAR_CAMIF_STATUS          BIT(2)
+
+#define VFE_CAMIF_CFG                                (0x47c)
+#define              CFG_VSYNC_SYNC_EDGE             (0)
+#define                      VSYNC_ACTIVE_HIGH       (0)
+#define                      VSYNC_ACTIVE_LOW        (1)
+#define              CFG_HSYNC_SYNC_EDGE             (1)
+#define                      HSYNC_ACTIVE_HIGH       (0)
+#define                      HSYNC_ACTIVE_LOW        (1)
+#define              CFG_VFE_SUBSAMPLE_ENABLE        BIT(4)
+#define              CFG_BUS_SUBSAMPLE_ENABLE        BIT(5)
+#define              CFG_VFE_OUTPUT_EN               BIT(6)
+#define              CFG_BUS_OUTPUT_EN               BIT(7)
+#define              CFG_BINNING_EN                  BIT(9)
+#define              CFG_FRAME_BASED_EN              BIT(10)
+#define              CFG_RAW_CROP_EN                 BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG                        0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG         0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG                0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG            0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN    0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN    0x49c
+#define VFE_0_CAMIF_STATUS                   0x4a4
+#define VFE_0_CAMIF_STATUS_HALT                      BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD                   (0x4ac)
+#define              REG_UPDATE_RDI(n)               BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n)          (0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n)         (0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n)                (0x205c + (n) * 4)
+#define              STATUS0_COMP_RESET_DONE         BIT(0)
+#define              STATUS0_COMP_REG_UPDATE0_DONE   BIT(1)
+#define              STATUS0_COMP_REG_UPDATE1_DONE   BIT(2)
+#define              STATUS0_COMP_REG_UPDATE2_DONE   BIT(3)
+#define              STATUS0_COMP_REG_UPDATE3_DONE   BIT(4)
+#define              STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
+#define              STATUS0_COMP0_BUF_DONE          BIT(5)
+#define              STATUS0_COMP1_BUF_DONE          BIT(6)
+#define              STATUS0_COMP2_BUF_DONE          BIT(7)
+#define              STATUS0_COMP3_BUF_DONE          BIT(8)
+#define              STATUS0_COMP4_BUF_DONE          BIT(9)
+#define              STATUS0_COMP5_BUF_DONE          BIT(10)
+#define              STATUS0_COMP_BUF_DONE(n)        BIT(n + 5)
+#define              STATUS0_COMP_ERROR              BIT(11)
+#define              STATUS0_COMP_OVERWRITE          BIT(12)
+#define              STATUS0_OVERFLOW                BIT(13)
+#define              STATUS0_VIOLATION               BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define              STATUS1_WM_CLIENT_BUF_DONE(n)           BIT(n)
+#define              STATUS1_EARLY_DONE                      BIT(24)
+#define              STATUS2_DUAL_COMP0_BUF_DONE             BIT(0)
+#define              STATUS2_DUAL_COMP1_BUF_DONE             BIT(1)
+#define              STATUS2_DUAL_COMP2_BUF_DONE             BIT(2)
+#define              STATUS2_DUAL_COMP3_BUF_DONE             BIT(3)
+#define              STATUS2_DUAL_COMP4_BUF_DONE             BIT(4)
+#define              STATUS2_DUAL_COMP5_BUF_DONE             BIT(5)
+#define              STATUS2_DUAL_COMP_BUF_DONE(n)           BIT(n)
+#define              STATUS2_DUAL_COMP_ERROR                 BIT(6)
+#define              STATUS2_DUAL_COMP_OVERWRITE             BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL             (0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG          (0x226c)
+#define              DEBUG_STATUS_CFG_STATUS0(n)     BIT(n)
+#define              DEBUG_STATUS_CFG_STATUS1(n)     BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER    (0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC         (0x2084)
+#define              BUS_VER2_MAX_CLIENTS (24)
+#define              WM_ADDR_NO_SYNC_DEFAULT_VAL \
+                             ((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE                      (0x200c)
+#define              WM_CGC_OVERRIDE_ALL             (0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL             (0x211c)
+
+#define VFE_BUS_WM_STATUS0(n)                        (0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n)                        (0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n)                    (0x2208 + (n) * 0x100)
+#define              WM_CFG_EN                       (0)
+#define              WM_CFG_MODE                     (1)
+#define                      MODE_QCOM_PLAIN (0)
+#define                      MODE_MIPI_RAW   (1)
+#define              WM_CFG_VIRTUALFRAME             (2)
+#define VFE_BUS_WM_HEADER_ADDR(n)            (0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n)             (0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n)             (0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n)              (0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n)               (0x221c + (n) * 0x100)
+#define              WM_BUFFER_DEFAULT_WIDTH         (0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n)              (0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n)             (0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n)                 (0x2228 + (n) * 0x100)
+#define              WM_STRIDE_DEFAULT_STRIDE        (0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n)   (0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n)  (0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n)               (0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n)              (0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n)                      (0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n)            (0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+     u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+     u32 gen = (hw_version >> 28) & 0xF;
+     u32 rev = (hw_version >> 16) & 0xFFF;
+     u32 step = hw_version & 0xFFFF;
+
+     dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{

drivers/media/platform/qcom/camss/camss-vfe-170.c line 233

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+     u32 reset_bits = GLOBAL_RESET_CMD_CORE          |
+                      GLOBAL_RESET_CMD_CAMIF         |
+                      GLOBAL_RESET_CMD_BUS           |
+                      GLOBAL_RESET_CMD_REGISTER      |
+                      GLOBAL_RESET_CMD_PM            |
+                      GLOBAL_RESET_CMD_BUS_MISR      |
+                      GLOBAL_RESET_CMD_IDLE_CGC      |
+                      GLOBAL_RESET_CMD_RDI0          |
+                      GLOBAL_RESET_CMD_RDI1          |
+                      GLOBAL_RESET_CMD_RDI2;

- so the reset_bits is set to 0x00001E77 in v5.

In v4 the reset_bits was set to 0x00003F9F which corresponds to:

        GLOBAL_RESET_CMD_CORE           |
        GLOBAL_RESET_CMD_CAMIF          |
        GLOBAL_RESET_CMD_BUS            |
        GLOBAL_RESET_CMD_BUS_BDG        |
        GLOBAL_RESET_CMD_REGISTER       |
        GLOBAL_RESET_CMD_TESTGEN        |
        GLOBAL_RESET_CMD_DSP            |
        GLOBAL_RESET_CMD_IDLE_CGC       |
        GLOBAL_RESET_CMD_RDI0           |
        GLOBAL_RESET_CMD_RDI1           |
        GLOBAL_RESET_CMD_RDI2           |
        GLOBAL_RESET_CMD_RDI3;

So the difference between v4 and v5 is:

reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP

reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR

Quoted 7 lines

- correct?

It is probably worth a few words in the v4 vs v5 changelog.

(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2 according to the driver code)

Great catch! I made a mistake with the bit-ordering after doing a hex->binary translation.
I'll straighten this out in v6.

Quoted 102 lines
Quoted 87 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +87 -0
+
+     writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+     /* Make sure IRQ mask has been written before resetting */
+     wmb();
+
+     writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+     u32 val;
+
+     /*Set Debug Registers*/
+     val = DEBUG_STATUS_CFG_STATUS0(1) |
+           DEBUG_STATUS_CFG_STATUS0(7);
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+     /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+     /* no clock gating at bus input */
+     val = WM_CGC_OVERRIDE_ALL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+     writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+     /* if addr_no_sync has default value then config the addr no sync reg */
+     val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+     writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+     val = WM_BUFFER_DEFAULT_WIDTH;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+     /* Configure stride for RDIs */
+     //val = pix->plane_fmt[0].bytesperline;
+     val = WM_STRIDE_DEFAULT_STRIDE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+     /* Enable WM */
+     val = 1 << WM_CFG_EN |
+           MODE_MIPI_RAW << WM_CFG_MODE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+     /* Disable WM */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+                       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;
+
+     writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+     writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+     /* Enforce ordering between previous reg writes and reg update */
+     wmb();
+
+     writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+     /* Enforce ordering between reg update and subsequent reg writes */
+     wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+                                     enum vfe_line_id line_id)
+{
+     vfe->reg_update &= ~REG_UPDATE_RDI(line_id);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 330

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+     vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+     vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));

Looking at the #defines in the beginning of this file, only part of the IRQ sources (not the whole 32 per each register) are used or defined.

Quoted 2 lines

Is it safe to unmask the unused (reserved?) bits in the above 5 IRQ mask registers?

Unfortunately this register is not defined at all in any documentation of the downstream[1] kernel, so I think the situation is actually a bit worse than what you've pointed out here.
I'd like to remove the register defines above since I don't have a reliable source for them. But I would like to keep the register writes just as they are since that seems to work.

What are your thoughts?

[1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845

Quoted 118 lines
Quoted 118 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +117 -0
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+     complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+     *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     /* Enforce ordering between IRQ Clear and Global IRQ Clear */
+     wmb();
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+     u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+     struct vfe_device *vfe = dev;
+     u32 status0, status1, vfe_bus_status[3];
+     int i, wm;
+
+     status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+             vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+             writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+     }
+
+     /* Enforce ordering between IRQ reading and interpretation */
+     wmb();
+
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+     writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+     if (status0 & STATUS_0_RESET_ACK)
+             vfe->isr_ops.reset_ack(vfe);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+                     vfe->isr_ops.reg_update(vfe, i);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_1_RDI_SOF(i))
+                     vfe->isr_ops.sof(vfe, i);
+
+     for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+             if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+                     vfe->isr_ops.comp_done(vfe, i);
+
+     for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+             if (status0 & BIT(9))
+                     if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+                             vfe->isr_ops.wm_done(vfe, wm);
+
+     return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+     unsigned long time;
+
+     return 0;
+
+     reinit_completion(&vfe->halt_complete);
+
+     time = wait_for_completion_timeout(&vfe->halt_complete,
+             msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+     if (!time) {
+             dev_err(vfe->camss->dev, "VFE halt timeout\n");
+             return -EIO;
+     }
+
+     return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+     int i;
+     int wm_idx;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output = &line->output;
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is running\n");
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 453

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+             goto error;
+     }
+
+     output->wm_num = 1;
+
+     for (i = 0; i < output->wm_num; i++) {

- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...

Ack.

Quoted 11 lines
Quoted 11 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+             wm_idx = vfe_reserve_wm(vfe, line->id);
+             if (wm_idx < 0) {
+                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
+                     goto error_get_wm;
+             }
+             output->wm_idx[i] = wm_idx;
+     }
+
+     output->drop_update_idx = 0;
+
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 469

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+
+error_get_wm:
+     for (i--; i >= 0; i--)

- ... and this one too. And the "i" local var is no longer needed.

Ack

Quoted 641 lines

Thanks,
Andrey

Quoted 637 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +321 -0
+             vfe_release_wm(vfe, output->wm_idx[i]);
+     output->state = VFE_OUTPUT_OFF;
+error:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     struct media_entity *sensor;
+     unsigned long flags;
+     unsigned int frame_skip = 0;
+     unsigned int i;
+
+     sensor = camss_find_sensor(&line->subdev.entity);
+     if (sensor) {
+             struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+             /* Max frame skip is 29 frames */
+             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+                     frame_skip = VFE_FRAME_DROP_VAL - 1;
+     }
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     ops->reg_update_clear(vfe, line->id);
+
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+                     output->state);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return -EINVAL;
+     }
+
+     WARN_ON(output->gen2.active_num);
+
+     output->state = VFE_OUTPUT_ON;
+
+     output->sequence = 0;
+     output->wait_reg_update = 0;
+     reinit_completion(&output->reg_update);
+
+     vfe_wm_start(vfe, output->wm_idx[0], line);
+
+     for (i = 0; i < 2; i++) {
+             output->buf[i] = vfe_buf_get_pending(output);
+             if (!output->buf[i])
+                     break;
+             output->gen2.active_num++;
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+     }
+
+     ops->reg_update(vfe, line->id);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     unsigned long flags;
+     unsigned int i;
+     bool done;
+     int timeout = 0;
+
+     do {
+             spin_lock_irqsave(&vfe->output_lock, flags);
+             done = !output->gen2.active_num;
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             usleep_range(10000, 20000);
+
+             if (timeout++ == 100) {
+                     dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+                     vfe_reset(vfe);
+                     output->gen2.active_num = 0;
+                     return 0;
+             }
+     } while (!done);
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     for (i = 0; i < output->wm_num; i++)
+             vfe_wm_stop(vfe, output->wm_idx[i]);
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     int ret;
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (!vfe->stream_count)
+             vfe_enable_irq_common(vfe);
+
+     vfe->stream_count++;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     ret = vfe_get_output(line);
+     if (ret < 0)
+             goto error_get_output;
+
+     ret = vfe_enable_output(line);
+     if (ret < 0)
+             goto error_enable_output;
+
+     vfe->was_streaming = 1;
+
+     return 0;
+
+
+error_enable_output:
+     vfe_put_output(line);
+
+error_get_output:
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+
+     vfe_disable_output(line);
+
+     vfe_put_output(line);
+
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     vfe->ops->reg_update_clear(vfe, line_id);
+
+     output = &vfe->line[line_id].output;
+
+     if (output->wait_reg_update) {
+             output->wait_reg_update = 0;
+             complete(&output->reg_update);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+     struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+     struct camss_buffer *ready_buf;
+     struct vfe_output *output;
+     unsigned long flags;
+     u32 index;
+     u64 ts = ktime_get_ns();
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Received wm done for unmapped index\n");
+             goto out_unlock;
+     }
+     output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+     ready_buf = output->buf[0];
+     if (!ready_buf) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Missing ready buf %d!\n", output->state);
+             goto out_unlock;
+     }
+
+     ready_buf->vb.vb2_buf.timestamp = ts;
+     ready_buf->vb.sequence = output->sequence++;
+
+     index = 0;
+     output->buf[0] = output->buf[1];
+     if (output->buf[0])
+             index = 1;
+
+     output->buf[index] = vfe_buf_get_pending(output);
+
+     if (output->buf[index])
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+     else
+             output->gen2.active_num--;
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+     return;
+
+out_unlock:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+                         struct camss_buffer *buf)
+{
+     struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+
+     output = &line->output;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+             output->buf[output->gen2.active_num++] = buf;
+             vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+     } else {
+             vfe_buf_add_pending(output, buf);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+     .reset_ack = vfe_isr_reset_ack,
+     .halt_ack = vfe_isr_halt_ack,
+     .reg_update = vfe_isr_reg_update,
+     .sof = vfe_isr_sof,
+     .comp_done = vfe_isr_comp_done,
+     .wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+     .queue_buffer = vfe_queue_buffer,
+     .flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_170;
+     vfe->video_ops = vfe_video_ops_170;
+
+     vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
+     .isr_read = vfe_isr_read,
+     .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_disable,
+     .vfe_enable = vfe_enable,
+     .vfe_halt = vfe_halt,
+     .violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe.c +38 -9
index 375843bd16af..6fafeb8a5484 100644
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
      { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
  };
 
+static const struct vfe_format formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+     { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+     { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+     { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+     { MEDIA_BUS_FMT_Y10_1X10, 10 },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
  /*
   * vfe_get_bpp - map media bus format to bits per pixel
   * @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                      return sink_code;
              }
      else if (vfe->camss->version == CAMSS_8x96 ||
-              vfe->camss->version == CAMSS_660)
+              vfe->camss->version == CAMSS_660 ||
+              vfe->camss->version == CAMSS_845)
              switch (sink_code) {
              case MEDIA_BUS_FMT_YUYV8_2X8:
              {
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
              return 0;
  }
 
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
  {
      unsigned long time;
 
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
              struct camss_clock *clock = &vfe->clock[i];
 
              if (!strcmp(clock->name, "vfe0") ||
-                 !strcmp(clock->name, "vfe1")) {
+                 !strcmp(clock->name, "vfe1") ||
+                 !strcmp(clock->name, "vfe_lite")) {
                      u64 min_rate = 0;
                      long rate;
 
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
      case CAMSS_660:
              vfe->ops = &vfe_ops_4_8;
              break;
+
+     case CAMSS_845:
+             vfe->ops = &vfe_ops_170;
+             break;
      default:
              return -EINVAL;
      }
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
                              l->formats = formats_rdi_8x96;
                              l->nformats = ARRAY_SIZE(formats_rdi_8x96);
                      }
+             } else if (camss->version == CAMSS_845) {
+                     l->formats = formats_rdi_845;
+                     l->nformats = ARRAY_SIZE(formats_rdi_845);
              } else {
                      return -EINVAL;
              }
drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
  #include "camss-video.h"
  #include "camss-vfe-gen1.h"
 
-
  #define MSM_VFE_PAD_SINK 0
  #define MSM_VFE_PAD_SRC 1
  #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
  #define to_vfe(ptr_line)    \
      container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
  enum vfe_output_state {
      VFE_OUTPUT_OFF,
      VFE_OUTPUT_RESERVED,
      VFE_OUTPUT_SINGLE,
      VFE_OUTPUT_CONTINUOUS,
      VFE_OUTPUT_IDLE,
-     VFE_OUTPUT_STOPPING
+     VFE_OUTPUT_STOPPING,
+     VFE_OUTPUT_ON,
  };
 
  enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
      VFE_LINE_RDI0 = 0,
      VFE_LINE_RDI1 = 1,
      VFE_LINE_RDI2 = 2,
+     VFE_LINE_NUM_GEN2 = 3,
      VFE_LINE_PIX = 3,
      VFE_LINE_NUM_GEN1 = 4,
      VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
                      int active_buf;
                      int wait_sof;
              } gen1;
+             struct {
+                     int active_num;
+             } gen2;
      };
      enum vfe_output_state state;
      unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
  struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
  int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
  /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
  int vfe_release_wm(struct vfe_device *vfe, u8 wm);
  int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
  extern const struct vfe_hw_ops vfe_ops_4_1;
  extern const struct vfe_hw_ops vfe_ops_4_7;
  extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
  #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0
index 97cea7c4d769..f282275af626 100644
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
        { { 1, 1 } }, { { 1, 1 } }, { 16 } },
  };
 
+static const struct camss_format_info formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
  static const struct camss_format_info formats_pix_8x16[] = {
      { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
        { { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
                      video->formats = formats_rdi_8x96;
                      video->nformats = ARRAY_SIZE(formats_rdi_8x96);
              }
+     }  else if (video->camss->version == CAMSS_845) {
+             video->formats = formats_rdi_845;
+             video->nformats = ARRAY_SIZE(formats_rdi_845);
      } else {
              ret = -EINVAL;
              goto error_video_register;
drivers/media/platform/qcom/camss/camss.c +61 -0
index 6c6f1e59ccd8..0e006def1996 100644
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
      }
  };
 
+static const struct resources vfe_res_845[] = {
+     /* VFE0 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe0", "vfe0_axi",
+                             "vfe0_src", "csi0",
+                             "csi0_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe0" },
+             .interrupt = { "vfe0" }
+     },
+
+     /* VFE1 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe1", "vfe1_axi",
+                             "vfe1_src", "csi1",
+                             "csi1_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe1" },
+             .interrupt = { "vfe1" }
+     },
+
+     /* VFE-lite */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe_lite",
+                             "vfe_lite_src", "csi2",
+                             "csi2_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe_lite" },
+             .interrupt = { "vfe_lite" }
+     }
+};
+
  /*
   * camss_add_clock_margin - Add margin to clock frequency rate
   * @rate: Clock frequency rate
#17 lore raw

Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170

Hi Robert,

Quoted 447 lines · Robert Foss
Quoted 62 lines · Andrey Konovalov

Hi Robert,

Thank you for your patch!

Quoted 56 lines · Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

   drivers/media/platform/qcom/camss/Makefile    |   1 +
   .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
   drivers/media/platform/qcom/camss/camss-vfe.c |  47 +-
   drivers/media/platform/qcom/camss/camss-vfe.h |  26 +-
   .../media/platform/qcom/camss/camss-video.c   |  52 ++
   drivers/media/platform/qcom/camss/camss.c     |  61 ++
   6 files changed, 957 insertions(+), 20 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c

drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
               camss-vfe-4-1.o \
               camss-vfe-4-7.o \
               camss-vfe-4-8.o \
+             camss-vfe-170.o \
               camss-vfe-gen1.o \
               camss-vfe.o \
               camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +2 -0
new file mode 100644
index 000000000000..c4991b1f22f8
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 8

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.

- it looks like the header comes from v4.7 without updating to Titan 170

Gotcha, thanks!

Quoted 255 lines
Quoted 216 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +215 -0
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION                               (0x000)
+
+#define VFE_GLOBAL_RESET_CMD                 (0x018)
+#define              GLOBAL_RESET_CMD_CORE           BIT(0)
+#define              GLOBAL_RESET_CMD_CAMIF          BIT(1)
+#define              GLOBAL_RESET_CMD_BUS            BIT(2)
+#define              GLOBAL_RESET_CMD_BUS_BDG        BIT(3)
+#define              GLOBAL_RESET_CMD_REGISTER       BIT(4)
+#define              GLOBAL_RESET_CMD_PM             BIT(5)
+#define              GLOBAL_RESET_CMD_BUS_MISR       BIT(6)
+#define              GLOBAL_RESET_CMD_TESTGEN        BIT(7)
+#define              GLOBAL_RESET_CMD_DSP            BIT(8)
+#define              GLOBAL_RESET_CMD_IDLE_CGC       BIT(9)
+#define              GLOBAL_RESET_CMD_RDI0           BIT(10)
+#define              GLOBAL_RESET_CMD_RDI1           BIT(11)
+#define              GLOBAL_RESET_CMD_RDI2           BIT(12)
+#define              GLOBAL_RESET_CMD_RDI3           BIT(13)
+#define              GLOBAL_RESET_CMD_VFE_DOMAIN     BIT(30)
+#define              GLOBAL_RESET_CMD_RESET_BYPASS   BIT(31)
+
+
+#define VFE_CORE_CFG                         (0x050)
+#define              CFG_PIXEL_PATTERN_YCBYCR        (0x4)
+#define              CFG_PIXEL_PATTERN_YCRYCB        (0x5)
+#define              CFG_PIXEL_PATTERN_CBYCRY        (0x6)
+#define              CFG_PIXEL_PATTERN_CRYCBY        (0x7)
+#define              CFG_COMPOSITE_REG_UPDATE_EN     BIT(4)
+
+#define VFE_IRQ_CMD                          (0x058)
+#define              CMD_GLOBAL_CLEAR                BIT(0)
+
+#define VFE_IRQ_MASK_0                                       (0x05c)
+#define              MASK_0_CAMIF_SOF                        BIT(0)
+#define              MASK_0_CAMIF_EOF                        BIT(1)
+#define              MASK_0_RDI_REG_UPDATE(n)                BIT((n) + 5)
+#define              MASK_0_IMAGE_MASTER_n_PING_PONG(n)      BIT((n) + 8)
+#define              MASK_0_IMAGE_COMPOSITE_DONE_n(n)        BIT((n) + 25)
+#define              MASK_0_RESET_ACK                        BIT(31)
+
+#define VFE_IRQ_MASK_1                                       (0x060)
+#define              MASK_1_CAMIF_ERROR                      BIT(0)
+#define              MASK_1_VIOLATION                        BIT(7)
+#define              MASK_1_BUS_BDG_HALT_ACK                 BIT(8)
+#define              MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)   BIT((n) + 9)
+#define              MASK_1_RDI_SOF(n)                       BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0                                      (0x064)
+#define VFE_IRQ_CLEAR_1                                      (0x068)
+
+#define VFE_IRQ_STATUS_0                             (0x06c)
+#define              STATUS_0_CAMIF_SOF                      BIT(0)
+#define              STATUS_0_RDI_REG_UPDATE(n)              BIT((n) + 5)
+#define              STATUS_0_IMAGE_MASTER_PING_PONG(n)      BIT((n) + 8)
+#define              STATUS_0_IMAGE_COMPOSITE_DONE(n)        BIT((n) + 25)
+#define              STATUS_0_RESET_ACK                      BIT(31)
+
+#define VFE_IRQ_STATUS_1                             (0x070)
+#define              STATUS_1_VIOLATION                      BIT(7)
+#define              STATUS_1_BUS_BDG_HALT_ACK               BIT(8)
+#define              STATUS_1_RDI_SOF(n)                     BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS                 (0x07c)
+
+#define VFE_CAMIF_CMD                                (0x478)
+#define              CMD_CLEAR_CAMIF_STATUS          BIT(2)
+
+#define VFE_CAMIF_CFG                                (0x47c)
+#define              CFG_VSYNC_SYNC_EDGE             (0)
+#define                      VSYNC_ACTIVE_HIGH       (0)
+#define                      VSYNC_ACTIVE_LOW        (1)
+#define              CFG_HSYNC_SYNC_EDGE             (1)
+#define                      HSYNC_ACTIVE_HIGH       (0)
+#define                      HSYNC_ACTIVE_LOW        (1)
+#define              CFG_VFE_SUBSAMPLE_ENABLE        BIT(4)
+#define              CFG_BUS_SUBSAMPLE_ENABLE        BIT(5)
+#define              CFG_VFE_OUTPUT_EN               BIT(6)
+#define              CFG_BUS_OUTPUT_EN               BIT(7)
+#define              CFG_BINNING_EN                  BIT(9)
+#define              CFG_FRAME_BASED_EN              BIT(10)
+#define              CFG_RAW_CROP_EN                 BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG                        0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG         0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG                0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG            0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN    0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN    0x49c
+#define VFE_0_CAMIF_STATUS                   0x4a4
+#define VFE_0_CAMIF_STATUS_HALT                      BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD                   (0x4ac)
+#define              REG_UPDATE_RDI(n)               BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n)          (0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n)         (0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n)                (0x205c + (n) * 4)
+#define              STATUS0_COMP_RESET_DONE         BIT(0)
+#define              STATUS0_COMP_REG_UPDATE0_DONE   BIT(1)
+#define              STATUS0_COMP_REG_UPDATE1_DONE   BIT(2)
+#define              STATUS0_COMP_REG_UPDATE2_DONE   BIT(3)
+#define              STATUS0_COMP_REG_UPDATE3_DONE   BIT(4)
+#define              STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
+#define              STATUS0_COMP0_BUF_DONE          BIT(5)
+#define              STATUS0_COMP1_BUF_DONE          BIT(6)
+#define              STATUS0_COMP2_BUF_DONE          BIT(7)
+#define              STATUS0_COMP3_BUF_DONE          BIT(8)
+#define              STATUS0_COMP4_BUF_DONE          BIT(9)
+#define              STATUS0_COMP5_BUF_DONE          BIT(10)
+#define              STATUS0_COMP_BUF_DONE(n)        BIT(n + 5)
+#define              STATUS0_COMP_ERROR              BIT(11)
+#define              STATUS0_COMP_OVERWRITE          BIT(12)
+#define              STATUS0_OVERFLOW                BIT(13)
+#define              STATUS0_VIOLATION               BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define              STATUS1_WM_CLIENT_BUF_DONE(n)           BIT(n)
+#define              STATUS1_EARLY_DONE                      BIT(24)
+#define              STATUS2_DUAL_COMP0_BUF_DONE             BIT(0)
+#define              STATUS2_DUAL_COMP1_BUF_DONE             BIT(1)
+#define              STATUS2_DUAL_COMP2_BUF_DONE             BIT(2)
+#define              STATUS2_DUAL_COMP3_BUF_DONE             BIT(3)
+#define              STATUS2_DUAL_COMP4_BUF_DONE             BIT(4)
+#define              STATUS2_DUAL_COMP5_BUF_DONE             BIT(5)
+#define              STATUS2_DUAL_COMP_BUF_DONE(n)           BIT(n)
+#define              STATUS2_DUAL_COMP_ERROR                 BIT(6)
+#define              STATUS2_DUAL_COMP_OVERWRITE             BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL             (0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG          (0x226c)
+#define              DEBUG_STATUS_CFG_STATUS0(n)     BIT(n)
+#define              DEBUG_STATUS_CFG_STATUS1(n)     BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER    (0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC         (0x2084)
+#define              BUS_VER2_MAX_CLIENTS (24)
+#define              WM_ADDR_NO_SYNC_DEFAULT_VAL \
+                             ((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE                      (0x200c)
+#define              WM_CGC_OVERRIDE_ALL             (0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL             (0x211c)
+
+#define VFE_BUS_WM_STATUS0(n)                        (0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n)                        (0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n)                    (0x2208 + (n) * 0x100)
+#define              WM_CFG_EN                       (0)
+#define              WM_CFG_MODE                     (1)
+#define                      MODE_QCOM_PLAIN (0)
+#define                      MODE_MIPI_RAW   (1)
+#define              WM_CFG_VIRTUALFRAME             (2)
+#define VFE_BUS_WM_HEADER_ADDR(n)            (0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n)             (0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n)             (0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n)              (0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n)               (0x221c + (n) * 0x100)
+#define              WM_BUFFER_DEFAULT_WIDTH         (0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n)              (0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n)             (0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n)                 (0x2228 + (n) * 0x100)
+#define              WM_STRIDE_DEFAULT_STRIDE        (0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n)   (0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n)  (0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n)               (0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n)              (0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n)                      (0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n)            (0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+     u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+     u32 gen = (hw_version >> 28) & 0xF;
+     u32 rev = (hw_version >> 16) & 0xFFF;
+     u32 step = hw_version & 0xFFFF;
+
+     dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{

drivers/media/platform/qcom/camss/camss-vfe-170.c line 233

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+     u32 reset_bits = GLOBAL_RESET_CMD_CORE          |
+                      GLOBAL_RESET_CMD_CAMIF         |
+                      GLOBAL_RESET_CMD_BUS           |
+                      GLOBAL_RESET_CMD_REGISTER      |
+                      GLOBAL_RESET_CMD_PM            |
+                      GLOBAL_RESET_CMD_BUS_MISR      |
+                      GLOBAL_RESET_CMD_IDLE_CGC      |
+                      GLOBAL_RESET_CMD_RDI0          |
+                      GLOBAL_RESET_CMD_RDI1          |
+                      GLOBAL_RESET_CMD_RDI2;

- so the reset_bits is set to 0x00001E77 in v5.

In v4 the reset_bits was set to 0x00003F9F which corresponds to:

         GLOBAL_RESET_CMD_CORE           |
         GLOBAL_RESET_CMD_CAMIF          |
         GLOBAL_RESET_CMD_BUS            |
         GLOBAL_RESET_CMD_BUS_BDG        |
         GLOBAL_RESET_CMD_REGISTER       |
         GLOBAL_RESET_CMD_TESTGEN        |
         GLOBAL_RESET_CMD_DSP            |
         GLOBAL_RESET_CMD_IDLE_CGC       |
         GLOBAL_RESET_CMD_RDI0           |
         GLOBAL_RESET_CMD_RDI1           |
         GLOBAL_RESET_CMD_RDI2           |
         GLOBAL_RESET_CMD_RDI3;

So the difference between v4 and v5 is:

reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP

reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR

Quoted 7 lines

- correct?

It is probably worth a few words in the v4 vs v5 changelog.

(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2 according to the driver code)

Great catch! I made a mistake with the bit-ordering after doing a hex->binary translation.
I'll straighten this out in v6.

Quoted 102 lines
Quoted 87 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +87 -0
+
+     writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+     /* Make sure IRQ mask has been written before resetting */
+     wmb();
+
+     writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+     u32 val;
+
+     /*Set Debug Registers*/
+     val = DEBUG_STATUS_CFG_STATUS0(1) |
+           DEBUG_STATUS_CFG_STATUS0(7);
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+     /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+     /* no clock gating at bus input */
+     val = WM_CGC_OVERRIDE_ALL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+     writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+     /* if addr_no_sync has default value then config the addr no sync reg */
+     val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+     writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+     val = WM_BUFFER_DEFAULT_WIDTH;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+     /* Configure stride for RDIs */
+     //val = pix->plane_fmt[0].bytesperline;
+     val = WM_STRIDE_DEFAULT_STRIDE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+     /* Enable WM */
+     val = 1 << WM_CFG_EN |
+           MODE_MIPI_RAW << WM_CFG_MODE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+     /* Disable WM */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+                       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;
+
+     writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+     writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+     /* Enforce ordering between previous reg writes and reg update */
+     wmb();
+
+     writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+     /* Enforce ordering between reg update and subsequent reg writes */
+     wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+                                     enum vfe_line_id line_id)
+{
+     vfe->reg_update &= ~REG_UPDATE_RDI(line_id);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 330

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+     vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+     vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));

Looking at the #defines in the beginning of this file, only part of the IRQ sources (not the whole 32 per each register) are used or defined.

Quoted 2 lines

Is it safe to unmask the unused (reserved?) bits in the above 5 IRQ mask registers?

Quoted 8 lines

Unfortunately this register is not defined at all in any documentation of the downstream[1] kernel, so I think the situation is actually a bit worse than what you've pointed out here.
I'd like to remove the register defines above since I don't have a reliable source for them. But I would like to keep the register writes just as they are since that seems to work.

What are your thoughts?

Without having the documentation, using the known good writes is fine. Removing the unused defines is also good.

Thanks,
Andrey

Quoted 794 lines

[1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845

Quoted 118 lines
Quoted 118 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +117 -0
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+     complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+     *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     /* Enforce ordering between IRQ Clear and Global IRQ Clear */
+     wmb();
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+     u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+     struct vfe_device *vfe = dev;
+     u32 status0, status1, vfe_bus_status[3];
+     int i, wm;
+
+     status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+             vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+             writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+     }
+
+     /* Enforce ordering between IRQ reading and interpretation */
+     wmb();
+
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+     writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+     if (status0 & STATUS_0_RESET_ACK)
+             vfe->isr_ops.reset_ack(vfe);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+                     vfe->isr_ops.reg_update(vfe, i);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_1_RDI_SOF(i))
+                     vfe->isr_ops.sof(vfe, i);
+
+     for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+             if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+                     vfe->isr_ops.comp_done(vfe, i);
+
+     for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+             if (status0 & BIT(9))
+                     if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+                             vfe->isr_ops.wm_done(vfe, wm);
+
+     return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+     unsigned long time;
+
+     return 0;
+
+     reinit_completion(&vfe->halt_complete);
+
+     time = wait_for_completion_timeout(&vfe->halt_complete,
+             msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+     if (!time) {
+             dev_err(vfe->camss->dev, "VFE halt timeout\n");
+             return -EIO;
+     }
+
+     return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+     int i;
+     int wm_idx;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output = &line->output;
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is running\n");
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 453

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+             goto error;
+     }
+
+     output->wm_num = 1;
+
+     for (i = 0; i < output->wm_num; i++) {

- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...

Ack.

Quoted 11 lines
Quoted 11 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+             wm_idx = vfe_reserve_wm(vfe, line->id);
+             if (wm_idx < 0) {
+                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
+                     goto error_get_wm;
+             }
+             output->wm_idx[i] = wm_idx;
+     }
+
+     output->drop_update_idx = 0;
+
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 469

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+
+error_get_wm:
+     for (i--; i >= 0; i--)

- ... and this one too. And the "i" local var is no longer needed.

Ack

Quoted 641 lines

Thanks,
Andrey

Quoted 637 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +321 -0
+             vfe_release_wm(vfe, output->wm_idx[i]);
+     output->state = VFE_OUTPUT_OFF;
+error:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     struct media_entity *sensor;
+     unsigned long flags;
+     unsigned int frame_skip = 0;
+     unsigned int i;
+
+     sensor = camss_find_sensor(&line->subdev.entity);
+     if (sensor) {
+             struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+             /* Max frame skip is 29 frames */
+             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+                     frame_skip = VFE_FRAME_DROP_VAL - 1;
+     }
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     ops->reg_update_clear(vfe, line->id);
+
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+                     output->state);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return -EINVAL;
+     }
+
+     WARN_ON(output->gen2.active_num);
+
+     output->state = VFE_OUTPUT_ON;
+
+     output->sequence = 0;
+     output->wait_reg_update = 0;
+     reinit_completion(&output->reg_update);
+
+     vfe_wm_start(vfe, output->wm_idx[0], line);
+
+     for (i = 0; i < 2; i++) {
+             output->buf[i] = vfe_buf_get_pending(output);
+             if (!output->buf[i])
+                     break;
+             output->gen2.active_num++;
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+     }
+
+     ops->reg_update(vfe, line->id);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     unsigned long flags;
+     unsigned int i;
+     bool done;
+     int timeout = 0;
+
+     do {
+             spin_lock_irqsave(&vfe->output_lock, flags);
+             done = !output->gen2.active_num;
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             usleep_range(10000, 20000);
+
+             if (timeout++ == 100) {
+                     dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+                     vfe_reset(vfe);
+                     output->gen2.active_num = 0;
+                     return 0;
+             }
+     } while (!done);
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     for (i = 0; i < output->wm_num; i++)
+             vfe_wm_stop(vfe, output->wm_idx[i]);
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     int ret;
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (!vfe->stream_count)
+             vfe_enable_irq_common(vfe);
+
+     vfe->stream_count++;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     ret = vfe_get_output(line);
+     if (ret < 0)
+             goto error_get_output;
+
+     ret = vfe_enable_output(line);
+     if (ret < 0)
+             goto error_enable_output;
+
+     vfe->was_streaming = 1;
+
+     return 0;
+
+
+error_enable_output:
+     vfe_put_output(line);
+
+error_get_output:
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+
+     vfe_disable_output(line);
+
+     vfe_put_output(line);
+
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     vfe->ops->reg_update_clear(vfe, line_id);
+
+     output = &vfe->line[line_id].output;
+
+     if (output->wait_reg_update) {
+             output->wait_reg_update = 0;
+             complete(&output->reg_update);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+     struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+     struct camss_buffer *ready_buf;
+     struct vfe_output *output;
+     unsigned long flags;
+     u32 index;
+     u64 ts = ktime_get_ns();
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Received wm done for unmapped index\n");
+             goto out_unlock;
+     }
+     output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+     ready_buf = output->buf[0];
+     if (!ready_buf) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Missing ready buf %d!\n", output->state);
+             goto out_unlock;
+     }
+
+     ready_buf->vb.vb2_buf.timestamp = ts;
+     ready_buf->vb.sequence = output->sequence++;
+
+     index = 0;
+     output->buf[0] = output->buf[1];
+     if (output->buf[0])
+             index = 1;
+
+     output->buf[index] = vfe_buf_get_pending(output);
+
+     if (output->buf[index])
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+     else
+             output->gen2.active_num--;
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+     return;
+
+out_unlock:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+                         struct camss_buffer *buf)
+{
+     struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+
+     output = &line->output;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+             output->buf[output->gen2.active_num++] = buf;
+             vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+     } else {
+             vfe_buf_add_pending(output, buf);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+     .reset_ack = vfe_isr_reset_ack,
+     .halt_ack = vfe_isr_halt_ack,
+     .reg_update = vfe_isr_reg_update,
+     .sof = vfe_isr_sof,
+     .comp_done = vfe_isr_comp_done,
+     .wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+     .queue_buffer = vfe_queue_buffer,
+     .flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_170;
+     vfe->video_ops = vfe_video_ops_170;
+
+     vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
+     .isr_read = vfe_isr_read,
+     .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_disable,
+     .vfe_enable = vfe_enable,
+     .vfe_halt = vfe_halt,
+     .violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe.c +38 -9
index 375843bd16af..6fafeb8a5484 100644
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
       { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
   };
 
+static const struct vfe_format formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+     { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+     { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+     { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+     { MEDIA_BUS_FMT_Y10_1X10, 10 },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
   /*
    * vfe_get_bpp - map media bus format to bits per pixel
    * @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                       return sink_code;
               }
       else if (vfe->camss->version == CAMSS_8x96 ||
-              vfe->camss->version == CAMSS_660)
+              vfe->camss->version == CAMSS_660 ||
+              vfe->camss->version == CAMSS_845)
               switch (sink_code) {
               case MEDIA_BUS_FMT_YUYV8_2X8:
               {
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
               return 0;
   }
 
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
   {
       unsigned long time;
 
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
               struct camss_clock *clock = &vfe->clock[i];
 
               if (!strcmp(clock->name, "vfe0") ||
-                 !strcmp(clock->name, "vfe1")) {
+                 !strcmp(clock->name, "vfe1") ||
+                 !strcmp(clock->name, "vfe_lite")) {
                       u64 min_rate = 0;
                       long rate;
 
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
       case CAMSS_660:
               vfe->ops = &vfe_ops_4_8;
               break;
+
+     case CAMSS_845:
+             vfe->ops = &vfe_ops_170;
+             break;
       default:
               return -EINVAL;
       }
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
                               l->formats = formats_rdi_8x96;
                               l->nformats = ARRAY_SIZE(formats_rdi_8x96);
                       }
+             } else if (camss->version == CAMSS_845) {
+                     l->formats = formats_rdi_845;
+                     l->nformats = ARRAY_SIZE(formats_rdi_845);
               } else {
                       return -EINVAL;
               }
drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
   #include "camss-video.h"
   #include "camss-vfe-gen1.h"
 
-
   #define MSM_VFE_PAD_SINK 0
   #define MSM_VFE_PAD_SRC 1
   #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
   #define to_vfe(ptr_line)    \
       container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
   enum vfe_output_state {
       VFE_OUTPUT_OFF,
       VFE_OUTPUT_RESERVED,
       VFE_OUTPUT_SINGLE,
       VFE_OUTPUT_CONTINUOUS,
       VFE_OUTPUT_IDLE,
-     VFE_OUTPUT_STOPPING
+     VFE_OUTPUT_STOPPING,
+     VFE_OUTPUT_ON,
   };
 
   enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
       VFE_LINE_RDI0 = 0,
       VFE_LINE_RDI1 = 1,
       VFE_LINE_RDI2 = 2,
+     VFE_LINE_NUM_GEN2 = 3,
       VFE_LINE_PIX = 3,
       VFE_LINE_NUM_GEN1 = 4,
       VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
                       int active_buf;
                       int wait_sof;
               } gen1;
+             struct {
+                     int active_num;
+             } gen2;
       };
       enum vfe_output_state state;
       unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
   struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
   int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
   /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
   int vfe_release_wm(struct vfe_device *vfe, u8 wm);
   int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
   extern const struct vfe_hw_ops vfe_ops_4_1;
   extern const struct vfe_hw_ops vfe_ops_4_7;
   extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
   #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0
index 97cea7c4d769..f282275af626 100644
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
         { { 1, 1 } }, { { 1, 1 } }, { 16 } },
   };
 
+static const struct camss_format_info formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
   static const struct camss_format_info formats_pix_8x16[] = {
       { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
         { { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
                       video->formats = formats_rdi_8x96;
                       video->nformats = ARRAY_SIZE(formats_rdi_8x96);
               }
+     }  else if (video->camss->version == CAMSS_845) {
+             video->formats = formats_rdi_845;
+             video->nformats = ARRAY_SIZE(formats_rdi_845);
       } else {
               ret = -EINVAL;
               goto error_video_register;
drivers/media/platform/qcom/camss/camss.c +61 -0
index 6c6f1e59ccd8..0e006def1996 100644
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
       }
   };
 
+static const struct resources vfe_res_845[] = {
+     /* VFE0 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe0", "vfe0_axi",
+                             "vfe0_src", "csi0",
+                             "csi0_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe0" },
+             .interrupt = { "vfe0" }
+     },
+
+     /* VFE1 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe1", "vfe1_axi",
+                             "vfe1_src", "csi1",
+                             "csi1_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe1" },
+             .interrupt = { "vfe1" }
+     },
+
+     /* VFE-lite */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe_lite",
+                             "vfe_lite_src", "csi2",
+                             "csi2_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe_lite" },
+             .interrupt = { "vfe_lite" }
+     }
+};
+
   /*
    * camss_add_clock_margin - Add margin to clock frequency rate
    * @rate: Clock frequency rate
#18 lore raw

Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170

Quoted 458 lines · Andrey Konovalov

Hi Robert,

Quoted 454 lines · Robert Foss
Quoted 62 lines · Andrey Konovalov

Hi Robert,

Thank you for your patch!

Quoted 56 lines · Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

   drivers/media/platform/qcom/camss/Makefile    |   1 +
   .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
   drivers/media/platform/qcom/camss/camss-vfe.c |  47 +-
   drivers/media/platform/qcom/camss/camss-vfe.h |  26 +-
   .../media/platform/qcom/camss/camss-video.c   |  52 ++
   drivers/media/platform/qcom/camss/camss.c     |  61 ++
   6 files changed, 957 insertions(+), 20 deletions(-)

create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c

drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
               camss-vfe-4-1.o \
               camss-vfe-4-7.o \
               camss-vfe-4-8.o \
+             camss-vfe-170.o \
               camss-vfe-gen1.o \
               camss-vfe.o \
               camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +2 -0
new file mode 100644
index 000000000000..c4991b1f22f8
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 8

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.

- it looks like the header comes from v4.7 without updating to Titan 170

Gotcha, thanks!

Quoted 255 lines
Quoted 216 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +215 -0
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION                               (0x000)
+
+#define VFE_GLOBAL_RESET_CMD                 (0x018)
+#define              GLOBAL_RESET_CMD_CORE           BIT(0)
+#define              GLOBAL_RESET_CMD_CAMIF          BIT(1)
+#define              GLOBAL_RESET_CMD_BUS            BIT(2)
+#define              GLOBAL_RESET_CMD_BUS_BDG        BIT(3)
+#define              GLOBAL_RESET_CMD_REGISTER       BIT(4)
+#define              GLOBAL_RESET_CMD_PM             BIT(5)
+#define              GLOBAL_RESET_CMD_BUS_MISR       BIT(6)
+#define              GLOBAL_RESET_CMD_TESTGEN        BIT(7)
+#define              GLOBAL_RESET_CMD_DSP            BIT(8)
+#define              GLOBAL_RESET_CMD_IDLE_CGC       BIT(9)
+#define              GLOBAL_RESET_CMD_RDI0           BIT(10)
+#define              GLOBAL_RESET_CMD_RDI1           BIT(11)
+#define              GLOBAL_RESET_CMD_RDI2           BIT(12)
+#define              GLOBAL_RESET_CMD_RDI3           BIT(13)
+#define              GLOBAL_RESET_CMD_VFE_DOMAIN     BIT(30)
+#define              GLOBAL_RESET_CMD_RESET_BYPASS   BIT(31)
+
+
+#define VFE_CORE_CFG                         (0x050)
+#define              CFG_PIXEL_PATTERN_YCBYCR        (0x4)
+#define              CFG_PIXEL_PATTERN_YCRYCB        (0x5)
+#define              CFG_PIXEL_PATTERN_CBYCRY        (0x6)
+#define              CFG_PIXEL_PATTERN_CRYCBY        (0x7)
+#define              CFG_COMPOSITE_REG_UPDATE_EN     BIT(4)
+
+#define VFE_IRQ_CMD                          (0x058)
+#define              CMD_GLOBAL_CLEAR                BIT(0)
+
+#define VFE_IRQ_MASK_0                                       (0x05c)
+#define              MASK_0_CAMIF_SOF                        BIT(0)
+#define              MASK_0_CAMIF_EOF                        BIT(1)
+#define              MASK_0_RDI_REG_UPDATE(n)                BIT((n) + 5)
+#define              MASK_0_IMAGE_MASTER_n_PING_PONG(n)      BIT((n) + 8)
+#define              MASK_0_IMAGE_COMPOSITE_DONE_n(n)        BIT((n) + 25)
+#define              MASK_0_RESET_ACK                        BIT(31)
+
+#define VFE_IRQ_MASK_1                                       (0x060)
+#define              MASK_1_CAMIF_ERROR                      BIT(0)
+#define              MASK_1_VIOLATION                        BIT(7)
+#define              MASK_1_BUS_BDG_HALT_ACK                 BIT(8)
+#define              MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)   BIT((n) + 9)
+#define              MASK_1_RDI_SOF(n)                       BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0                                      (0x064)
+#define VFE_IRQ_CLEAR_1                                      (0x068)
+
+#define VFE_IRQ_STATUS_0                             (0x06c)
+#define              STATUS_0_CAMIF_SOF                      BIT(0)
+#define              STATUS_0_RDI_REG_UPDATE(n)              BIT((n) + 5)
+#define              STATUS_0_IMAGE_MASTER_PING_PONG(n)      BIT((n) + 8)
+#define              STATUS_0_IMAGE_COMPOSITE_DONE(n)        BIT((n) + 25)
+#define              STATUS_0_RESET_ACK                      BIT(31)
+
+#define VFE_IRQ_STATUS_1                             (0x070)
+#define              STATUS_1_VIOLATION                      BIT(7)
+#define              STATUS_1_BUS_BDG_HALT_ACK               BIT(8)
+#define              STATUS_1_RDI_SOF(n)                     BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS                 (0x07c)
+
+#define VFE_CAMIF_CMD                                (0x478)
+#define              CMD_CLEAR_CAMIF_STATUS          BIT(2)
+
+#define VFE_CAMIF_CFG                                (0x47c)
+#define              CFG_VSYNC_SYNC_EDGE             (0)
+#define                      VSYNC_ACTIVE_HIGH       (0)
+#define                      VSYNC_ACTIVE_LOW        (1)
+#define              CFG_HSYNC_SYNC_EDGE             (1)
+#define                      HSYNC_ACTIVE_HIGH       (0)
+#define                      HSYNC_ACTIVE_LOW        (1)
+#define              CFG_VFE_SUBSAMPLE_ENABLE        BIT(4)
+#define              CFG_BUS_SUBSAMPLE_ENABLE        BIT(5)
+#define              CFG_VFE_OUTPUT_EN               BIT(6)
+#define              CFG_BUS_OUTPUT_EN               BIT(7)
+#define              CFG_BINNING_EN                  BIT(9)
+#define              CFG_FRAME_BASED_EN              BIT(10)
+#define              CFG_RAW_CROP_EN                 BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG                        0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG         0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG                0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG            0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN    0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN    0x49c
+#define VFE_0_CAMIF_STATUS                   0x4a4
+#define VFE_0_CAMIF_STATUS_HALT                      BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD                   (0x4ac)
+#define              REG_UPDATE_RDI(n)               BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n)          (0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n)         (0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n)                (0x205c + (n) * 4)
+#define              STATUS0_COMP_RESET_DONE         BIT(0)
+#define              STATUS0_COMP_REG_UPDATE0_DONE   BIT(1)
+#define              STATUS0_COMP_REG_UPDATE1_DONE   BIT(2)
+#define              STATUS0_COMP_REG_UPDATE2_DONE   BIT(3)
+#define              STATUS0_COMP_REG_UPDATE3_DONE   BIT(4)
+#define              STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
+#define              STATUS0_COMP0_BUF_DONE          BIT(5)
+#define              STATUS0_COMP1_BUF_DONE          BIT(6)
+#define              STATUS0_COMP2_BUF_DONE          BIT(7)
+#define              STATUS0_COMP3_BUF_DONE          BIT(8)
+#define              STATUS0_COMP4_BUF_DONE          BIT(9)
+#define              STATUS0_COMP5_BUF_DONE          BIT(10)
+#define              STATUS0_COMP_BUF_DONE(n)        BIT(n + 5)
+#define              STATUS0_COMP_ERROR              BIT(11)
+#define              STATUS0_COMP_OVERWRITE          BIT(12)
+#define              STATUS0_OVERFLOW                BIT(13)
+#define              STATUS0_VIOLATION               BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define              STATUS1_WM_CLIENT_BUF_DONE(n)           BIT(n)
+#define              STATUS1_EARLY_DONE                      BIT(24)
+#define              STATUS2_DUAL_COMP0_BUF_DONE             BIT(0)
+#define              STATUS2_DUAL_COMP1_BUF_DONE             BIT(1)
+#define              STATUS2_DUAL_COMP2_BUF_DONE             BIT(2)
+#define              STATUS2_DUAL_COMP3_BUF_DONE             BIT(3)
+#define              STATUS2_DUAL_COMP4_BUF_DONE             BIT(4)
+#define              STATUS2_DUAL_COMP5_BUF_DONE             BIT(5)
+#define              STATUS2_DUAL_COMP_BUF_DONE(n)           BIT(n)
+#define              STATUS2_DUAL_COMP_ERROR                 BIT(6)
+#define              STATUS2_DUAL_COMP_OVERWRITE             BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL             (0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG          (0x226c)
+#define              DEBUG_STATUS_CFG_STATUS0(n)     BIT(n)
+#define              DEBUG_STATUS_CFG_STATUS1(n)     BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER    (0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC         (0x2084)
+#define              BUS_VER2_MAX_CLIENTS (24)
+#define              WM_ADDR_NO_SYNC_DEFAULT_VAL \
+                             ((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE                      (0x200c)
+#define              WM_CGC_OVERRIDE_ALL             (0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL             (0x211c)
+
+#define VFE_BUS_WM_STATUS0(n)                        (0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n)                        (0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n)                    (0x2208 + (n) * 0x100)
+#define              WM_CFG_EN                       (0)
+#define              WM_CFG_MODE                     (1)
+#define                      MODE_QCOM_PLAIN (0)
+#define                      MODE_MIPI_RAW   (1)
+#define              WM_CFG_VIRTUALFRAME             (2)
+#define VFE_BUS_WM_HEADER_ADDR(n)            (0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n)             (0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n)             (0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n)              (0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n)               (0x221c + (n) * 0x100)
+#define              WM_BUFFER_DEFAULT_WIDTH         (0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n)              (0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n)             (0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n)                 (0x2228 + (n) * 0x100)
+#define              WM_STRIDE_DEFAULT_STRIDE        (0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n)   (0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n)  (0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n)               (0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n)              (0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n)                      (0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n)            (0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+     u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+     u32 gen = (hw_version >> 28) & 0xF;
+     u32 rev = (hw_version >> 16) & 0xFFF;
+     u32 step = hw_version & 0xFFFF;
+
+     dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{

drivers/media/platform/qcom/camss/camss-vfe-170.c line 233

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+     u32 reset_bits = GLOBAL_RESET_CMD_CORE          |
+                      GLOBAL_RESET_CMD_CAMIF         |
+                      GLOBAL_RESET_CMD_BUS           |
+                      GLOBAL_RESET_CMD_REGISTER      |
+                      GLOBAL_RESET_CMD_PM            |
+                      GLOBAL_RESET_CMD_BUS_MISR      |
+                      GLOBAL_RESET_CMD_IDLE_CGC      |
+                      GLOBAL_RESET_CMD_RDI0          |
+                      GLOBAL_RESET_CMD_RDI1          |
+                      GLOBAL_RESET_CMD_RDI2;

- so the reset_bits is set to 0x00001E77 in v5.

In v4 the reset_bits was set to 0x00003F9F which corresponds to:

         GLOBAL_RESET_CMD_CORE           |
         GLOBAL_RESET_CMD_CAMIF          |
         GLOBAL_RESET_CMD_BUS            |
         GLOBAL_RESET_CMD_BUS_BDG        |
         GLOBAL_RESET_CMD_REGISTER       |
         GLOBAL_RESET_CMD_TESTGEN        |
         GLOBAL_RESET_CMD_DSP            |
         GLOBAL_RESET_CMD_IDLE_CGC       |
         GLOBAL_RESET_CMD_RDI0           |
         GLOBAL_RESET_CMD_RDI1           |
         GLOBAL_RESET_CMD_RDI2           |
         GLOBAL_RESET_CMD_RDI3;

So the difference between v4 and v5 is:

reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP

reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR

Quoted 7 lines

- correct?

It is probably worth a few words in the v4 vs v5 changelog.

(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2 according to the driver code)

Great catch! I made a mistake with the bit-ordering after doing a hex->binary translation.
I'll straighten this out in v6.

Quoted 102 lines
Quoted 87 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +87 -0
+
+     writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+     /* Make sure IRQ mask has been written before resetting */
+     wmb();
+
+     writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+     u32 val;
+
+     /*Set Debug Registers*/
+     val = DEBUG_STATUS_CFG_STATUS0(1) |
+           DEBUG_STATUS_CFG_STATUS0(7);
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+     /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+     /* no clock gating at bus input */
+     val = WM_CGC_OVERRIDE_ALL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+     writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+     /* if addr_no_sync has default value then config the addr no sync reg */
+     val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+     writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+     val = WM_BUFFER_DEFAULT_WIDTH;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+     /* Configure stride for RDIs */
+     //val = pix->plane_fmt[0].bytesperline;
+     val = WM_STRIDE_DEFAULT_STRIDE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+     /* Enable WM */
+     val = 1 << WM_CFG_EN |
+           MODE_MIPI_RAW << WM_CFG_MODE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+     /* Disable WM */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+                       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;
+
+     writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+     writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+     /* Enforce ordering between previous reg writes and reg update */
+     wmb();
+
+     writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+     /* Enforce ordering between reg update and subsequent reg writes */
+     wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+                                     enum vfe_line_id line_id)
+{
+     vfe->reg_update &= ~REG_UPDATE_RDI(line_id);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 330

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+     vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+     vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));

Looking at the #defines in the beginning of this file, only part of the IRQ sources (not the whole 32 per each register) are used or defined.

Quoted 2 lines

Is it safe to unmask the unused (reserved?) bits in the above 5 IRQ mask registers?

Unfortunately this register is not defined at all in any documentation of the downstream[1] kernel, so I think the situation is actually a bit worse than what you've pointed out here.
I'd like to remove the register defines above since I don't have a reliable source for them. But I would like to keep the register writes just as they are since that seems to work.

Quoted 4 lines
Quoted 1 line

What are your thoughts?

Without having the documentation, using the known good writes is fine. Removing the unused defines is also good.

Some of the register definitions like STATUS0_COMP_BUF_DONE is used currently, and are documented for later generations of this hardware. But I'm not finding any traces for this generation. Chances are that they are the same, but I cant guarantee it. But at least some of them seem to be correct, and are indeed needed. I'm tempted to leave this exactly the way it is. Would that be ok for you?

Quoted 798 lines

Thanks,
Andrey

Quoted 794 lines

[1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845

Quoted 118 lines
Quoted 118 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +117 -0
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+     complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+     *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     /* Enforce ordering between IRQ Clear and Global IRQ Clear */
+     wmb();
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+     u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+     struct vfe_device *vfe = dev;
+     u32 status0, status1, vfe_bus_status[3];
+     int i, wm;
+
+     status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+             vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+             writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+     }
+
+     /* Enforce ordering between IRQ reading and interpretation */
+     wmb();
+
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+     writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+     if (status0 & STATUS_0_RESET_ACK)
+             vfe->isr_ops.reset_ack(vfe);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+                     vfe->isr_ops.reg_update(vfe, i);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_1_RDI_SOF(i))
+                     vfe->isr_ops.sof(vfe, i);
+
+     for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+             if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+                     vfe->isr_ops.comp_done(vfe, i);
+
+     for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+             if (status0 & BIT(9))
+                     if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+                             vfe->isr_ops.wm_done(vfe, wm);
+
+     return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+     unsigned long time;
+
+     return 0;
+
+     reinit_completion(&vfe->halt_complete);
+
+     time = wait_for_completion_timeout(&vfe->halt_complete,
+             msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+     if (!time) {
+             dev_err(vfe->camss->dev, "VFE halt timeout\n");
+             return -EIO;
+     }
+
+     return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+     int i;
+     int wm_idx;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output = &line->output;
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is running\n");
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 453

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+             goto error;
+     }
+
+     output->wm_num = 1;
+
+     for (i = 0; i < output->wm_num; i++) {

- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...

Ack.

Quoted 11 lines
Quoted 11 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+             wm_idx = vfe_reserve_wm(vfe, line->id);
+             if (wm_idx < 0) {
+                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
+                     goto error_get_wm;
+             }
+             output->wm_idx[i] = wm_idx;
+     }
+
+     output->drop_update_idx = 0;
+
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 469

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+
+error_get_wm:
+     for (i--; i >= 0; i--)

- ... and this one too. And the "i" local var is no longer needed.

Ack

Quoted 641 lines

Thanks,
Andrey

Quoted 637 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +321 -0
+             vfe_release_wm(vfe, output->wm_idx[i]);
+     output->state = VFE_OUTPUT_OFF;
+error:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     struct media_entity *sensor;
+     unsigned long flags;
+     unsigned int frame_skip = 0;
+     unsigned int i;
+
+     sensor = camss_find_sensor(&line->subdev.entity);
+     if (sensor) {
+             struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+             /* Max frame skip is 29 frames */
+             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+                     frame_skip = VFE_FRAME_DROP_VAL - 1;
+     }
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     ops->reg_update_clear(vfe, line->id);
+
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+                     output->state);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return -EINVAL;
+     }
+
+     WARN_ON(output->gen2.active_num);
+
+     output->state = VFE_OUTPUT_ON;
+
+     output->sequence = 0;
+     output->wait_reg_update = 0;
+     reinit_completion(&output->reg_update);
+
+     vfe_wm_start(vfe, output->wm_idx[0], line);
+
+     for (i = 0; i < 2; i++) {
+             output->buf[i] = vfe_buf_get_pending(output);
+             if (!output->buf[i])
+                     break;
+             output->gen2.active_num++;
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+     }
+
+     ops->reg_update(vfe, line->id);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     unsigned long flags;
+     unsigned int i;
+     bool done;
+     int timeout = 0;
+
+     do {
+             spin_lock_irqsave(&vfe->output_lock, flags);
+             done = !output->gen2.active_num;
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             usleep_range(10000, 20000);
+
+             if (timeout++ == 100) {
+                     dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+                     vfe_reset(vfe);
+                     output->gen2.active_num = 0;
+                     return 0;
+             }
+     } while (!done);
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     for (i = 0; i < output->wm_num; i++)
+             vfe_wm_stop(vfe, output->wm_idx[i]);
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     int ret;
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (!vfe->stream_count)
+             vfe_enable_irq_common(vfe);
+
+     vfe->stream_count++;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     ret = vfe_get_output(line);
+     if (ret < 0)
+             goto error_get_output;
+
+     ret = vfe_enable_output(line);
+     if (ret < 0)
+             goto error_enable_output;
+
+     vfe->was_streaming = 1;
+
+     return 0;
+
+
+error_enable_output:
+     vfe_put_output(line);
+
+error_get_output:
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+
+     vfe_disable_output(line);
+
+     vfe_put_output(line);
+
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     vfe->ops->reg_update_clear(vfe, line_id);
+
+     output = &vfe->line[line_id].output;
+
+     if (output->wait_reg_update) {
+             output->wait_reg_update = 0;
+             complete(&output->reg_update);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+     struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+     struct camss_buffer *ready_buf;
+     struct vfe_output *output;
+     unsigned long flags;
+     u32 index;
+     u64 ts = ktime_get_ns();
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Received wm done for unmapped index\n");
+             goto out_unlock;
+     }
+     output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+     ready_buf = output->buf[0];
+     if (!ready_buf) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Missing ready buf %d!\n", output->state);
+             goto out_unlock;
+     }
+
+     ready_buf->vb.vb2_buf.timestamp = ts;
+     ready_buf->vb.sequence = output->sequence++;
+
+     index = 0;
+     output->buf[0] = output->buf[1];
+     if (output->buf[0])
+             index = 1;
+
+     output->buf[index] = vfe_buf_get_pending(output);
+
+     if (output->buf[index])
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+     else
+             output->gen2.active_num--;
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+     return;
+
+out_unlock:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+                         struct camss_buffer *buf)
+{
+     struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+
+     output = &line->output;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+             output->buf[output->gen2.active_num++] = buf;
+             vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+     } else {
+             vfe_buf_add_pending(output, buf);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+     .reset_ack = vfe_isr_reset_ack,
+     .halt_ack = vfe_isr_halt_ack,
+     .reg_update = vfe_isr_reg_update,
+     .sof = vfe_isr_sof,
+     .comp_done = vfe_isr_comp_done,
+     .wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+     .queue_buffer = vfe_queue_buffer,
+     .flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_170;
+     vfe->video_ops = vfe_video_ops_170;
+
+     vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
+     .isr_read = vfe_isr_read,
+     .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_disable,
+     .vfe_enable = vfe_enable,
+     .vfe_halt = vfe_halt,
+     .violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe.c +38 -9
index 375843bd16af..6fafeb8a5484 100644
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
       { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
   };
 
+static const struct vfe_format formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+     { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+     { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+     { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+     { MEDIA_BUS_FMT_Y10_1X10, 10 },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
   /*
    * vfe_get_bpp - map media bus format to bits per pixel
    * @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                       return sink_code;
               }
       else if (vfe->camss->version == CAMSS_8x96 ||
-              vfe->camss->version == CAMSS_660)
+              vfe->camss->version == CAMSS_660 ||
+              vfe->camss->version == CAMSS_845)
               switch (sink_code) {
               case MEDIA_BUS_FMT_YUYV8_2X8:
               {
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
               return 0;
   }
 
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
   {
       unsigned long time;
 
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
               struct camss_clock *clock = &vfe->clock[i];
 
               if (!strcmp(clock->name, "vfe0") ||
-                 !strcmp(clock->name, "vfe1")) {
+                 !strcmp(clock->name, "vfe1") ||
+                 !strcmp(clock->name, "vfe_lite")) {
                       u64 min_rate = 0;
                       long rate;
 
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
       case CAMSS_660:
               vfe->ops = &vfe_ops_4_8;
               break;
+
+     case CAMSS_845:
+             vfe->ops = &vfe_ops_170;
+             break;
       default:
               return -EINVAL;
       }
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
                               l->formats = formats_rdi_8x96;
                               l->nformats = ARRAY_SIZE(formats_rdi_8x96);
                       }
+             } else if (camss->version == CAMSS_845) {
+                     l->formats = formats_rdi_845;
+                     l->nformats = ARRAY_SIZE(formats_rdi_845);
               } else {
                       return -EINVAL;
               }
drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
   #include "camss-video.h"
   #include "camss-vfe-gen1.h"
 
-
   #define MSM_VFE_PAD_SINK 0
   #define MSM_VFE_PAD_SRC 1
   #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
   #define to_vfe(ptr_line)    \
       container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
   enum vfe_output_state {
       VFE_OUTPUT_OFF,
       VFE_OUTPUT_RESERVED,
       VFE_OUTPUT_SINGLE,
       VFE_OUTPUT_CONTINUOUS,
       VFE_OUTPUT_IDLE,
-     VFE_OUTPUT_STOPPING
+     VFE_OUTPUT_STOPPING,
+     VFE_OUTPUT_ON,
   };
 
   enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
       VFE_LINE_RDI0 = 0,
       VFE_LINE_RDI1 = 1,
       VFE_LINE_RDI2 = 2,
+     VFE_LINE_NUM_GEN2 = 3,
       VFE_LINE_PIX = 3,
       VFE_LINE_NUM_GEN1 = 4,
       VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
                       int active_buf;
                       int wait_sof;
               } gen1;
+             struct {
+                     int active_num;
+             } gen2;
       };
       enum vfe_output_state state;
       unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
   struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
   int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
   /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
   int vfe_release_wm(struct vfe_device *vfe, u8 wm);
   int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
   extern const struct vfe_hw_ops vfe_ops_4_1;
   extern const struct vfe_hw_ops vfe_ops_4_7;
   extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
   #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0
index 97cea7c4d769..f282275af626 100644
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
         { { 1, 1 } }, { { 1, 1 } }, { 16 } },
   };
 
+static const struct camss_format_info formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
   static const struct camss_format_info formats_pix_8x16[] = {
       { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
         { { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
                       video->formats = formats_rdi_8x96;
                       video->nformats = ARRAY_SIZE(formats_rdi_8x96);
               }
+     }  else if (video->camss->version == CAMSS_845) {
+             video->formats = formats_rdi_845;
+             video->nformats = ARRAY_SIZE(formats_rdi_845);
       } else {
               ret = -EINVAL;
               goto error_video_register;
drivers/media/platform/qcom/camss/camss.c +61 -0
index 6c6f1e59ccd8..0e006def1996 100644
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
       }
   };
 
+static const struct resources vfe_res_845[] = {
+     /* VFE0 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe0", "vfe0_axi",
+                             "vfe0_src", "csi0",
+                             "csi0_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe0" },
+             .interrupt = { "vfe0" }
+     },
+
+     /* VFE1 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe1", "vfe1_axi",
+                             "vfe1_src", "csi1",
+                             "csi1_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe1" },
+             .interrupt = { "vfe1" }
+     },
+
+     /* VFE-lite */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe_lite",
+                             "vfe_lite_src", "csi2",
+                             "csi2_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe_lite" },
+             .interrupt = { "vfe_lite" }
+     }
+};
+
   /*
    * camss_add_clock_margin - Add margin to clock frequency rate
    * @rate: Clock frequency rate
#19 lore raw

Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170

Hi Robert,

Quoted 465 lines · Robert Foss
Quoted 458 lines · Andrey Konovalov

Hi Robert,

Quoted 454 lines · Robert Foss
Quoted 62 lines · Andrey Konovalov

Hi Robert,

Thank you for your patch!

Quoted 56 lines · Robert Foss

Add register definitions for version 170 of the Titan architecture and implement support for the RDI output mode.

The RDI mode as opposed to the PIX output mode for the VFE unit does not support any ISP functionality. This means essentially only supporting dumping the output of the whatever the CSI decoder receives from the sensor.

For example will a sensor outputting YUV pixel format frames, only allow the VFE to dump those frames as they are received by the ISP to memory through the RDI interface.

---

Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments

Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable

drivers/media/platform/qcom/camss/Makefile | 1 +
.../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++ drivers/media/platform/qcom/camss/camss-vfe.c | 47 +- drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
.../media/platform/qcom/camss/camss-video.c | 52 ++
drivers/media/platform/qcom/camss/camss.c | 61 ++
6 files changed, 957 insertions(+), 20 deletions(-)
create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c

drivers/media/platform/qcom/camss/Makefile +1 -0
index 940c0ae3e003..052c4f405fa3 100644
@@ -11,6 +11,7 @@ qcom-camss-objs += \
                camss-vfe-4-1.o \
                camss-vfe-4-7.o \
                camss-vfe-4-8.o \
+             camss-vfe-170.o \
                camss-vfe-gen1.o \
                camss-vfe.o \
                camss-video.o \
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +2 -0
new file mode 100644
index 000000000000..c4991b1f22f8
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 8

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.

- it looks like the header comes from v4.7 without updating to Titan 170

Gotcha, thanks!

Quoted 255 lines
Quoted 216 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +215 -0
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION                               (0x000)
+
+#define VFE_GLOBAL_RESET_CMD                 (0x018)
+#define              GLOBAL_RESET_CMD_CORE           BIT(0)
+#define              GLOBAL_RESET_CMD_CAMIF          BIT(1)
+#define              GLOBAL_RESET_CMD_BUS            BIT(2)
+#define              GLOBAL_RESET_CMD_BUS_BDG        BIT(3)
+#define              GLOBAL_RESET_CMD_REGISTER       BIT(4)
+#define              GLOBAL_RESET_CMD_PM             BIT(5)
+#define              GLOBAL_RESET_CMD_BUS_MISR       BIT(6)
+#define              GLOBAL_RESET_CMD_TESTGEN        BIT(7)
+#define              GLOBAL_RESET_CMD_DSP            BIT(8)
+#define              GLOBAL_RESET_CMD_IDLE_CGC       BIT(9)
+#define              GLOBAL_RESET_CMD_RDI0           BIT(10)
+#define              GLOBAL_RESET_CMD_RDI1           BIT(11)
+#define              GLOBAL_RESET_CMD_RDI2           BIT(12)
+#define              GLOBAL_RESET_CMD_RDI3           BIT(13)
+#define              GLOBAL_RESET_CMD_VFE_DOMAIN     BIT(30)
+#define              GLOBAL_RESET_CMD_RESET_BYPASS   BIT(31)
+
+
+#define VFE_CORE_CFG                         (0x050)
+#define              CFG_PIXEL_PATTERN_YCBYCR        (0x4)
+#define              CFG_PIXEL_PATTERN_YCRYCB        (0x5)
+#define              CFG_PIXEL_PATTERN_CBYCRY        (0x6)
+#define              CFG_PIXEL_PATTERN_CRYCBY        (0x7)
+#define              CFG_COMPOSITE_REG_UPDATE_EN     BIT(4)
+
+#define VFE_IRQ_CMD                          (0x058)
+#define              CMD_GLOBAL_CLEAR                BIT(0)
+
+#define VFE_IRQ_MASK_0                                       (0x05c)
+#define              MASK_0_CAMIF_SOF                        BIT(0)
+#define              MASK_0_CAMIF_EOF                        BIT(1)
+#define              MASK_0_RDI_REG_UPDATE(n)                BIT((n) + 5)
+#define              MASK_0_IMAGE_MASTER_n_PING_PONG(n)      BIT((n) + 8)
+#define              MASK_0_IMAGE_COMPOSITE_DONE_n(n)        BIT((n) + 25)
+#define              MASK_0_RESET_ACK                        BIT(31)
+
+#define VFE_IRQ_MASK_1                                       (0x060)
+#define              MASK_1_CAMIF_ERROR                      BIT(0)
+#define              MASK_1_VIOLATION                        BIT(7)
+#define              MASK_1_BUS_BDG_HALT_ACK                 BIT(8)
+#define              MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n)   BIT((n) + 9)
+#define              MASK_1_RDI_SOF(n)                       BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0                                      (0x064)
+#define VFE_IRQ_CLEAR_1                                      (0x068)
+
+#define VFE_IRQ_STATUS_0                             (0x06c)
+#define              STATUS_0_CAMIF_SOF                      BIT(0)
+#define              STATUS_0_RDI_REG_UPDATE(n)              BIT((n) + 5)
+#define              STATUS_0_IMAGE_MASTER_PING_PONG(n)      BIT((n) + 8)
+#define              STATUS_0_IMAGE_COMPOSITE_DONE(n)        BIT((n) + 25)
+#define              STATUS_0_RESET_ACK                      BIT(31)
+
+#define VFE_IRQ_STATUS_1                             (0x070)
+#define              STATUS_1_VIOLATION                      BIT(7)
+#define              STATUS_1_BUS_BDG_HALT_ACK               BIT(8)
+#define              STATUS_1_RDI_SOF(n)                     BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS                 (0x07c)
+
+#define VFE_CAMIF_CMD                                (0x478)
+#define              CMD_CLEAR_CAMIF_STATUS          BIT(2)
+
+#define VFE_CAMIF_CFG                                (0x47c)
+#define              CFG_VSYNC_SYNC_EDGE             (0)
+#define                      VSYNC_ACTIVE_HIGH       (0)
+#define                      VSYNC_ACTIVE_LOW        (1)
+#define              CFG_HSYNC_SYNC_EDGE             (1)
+#define                      HSYNC_ACTIVE_HIGH       (0)
+#define                      HSYNC_ACTIVE_LOW        (1)
+#define              CFG_VFE_SUBSAMPLE_ENABLE        BIT(4)
+#define              CFG_BUS_SUBSAMPLE_ENABLE        BIT(5)
+#define              CFG_VFE_OUTPUT_EN               BIT(6)
+#define              CFG_BUS_OUTPUT_EN               BIT(7)
+#define              CFG_BINNING_EN                  BIT(9)
+#define              CFG_FRAME_BASED_EN              BIT(10)
+#define              CFG_RAW_CROP_EN                 BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG                        0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG         0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG                0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG            0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN    0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN    0x49c
+#define VFE_0_CAMIF_STATUS                   0x4a4
+#define VFE_0_CAMIF_STATUS_HALT                      BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD                   (0x4ac)
+#define              REG_UPDATE_RDI(n)               BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n)          (0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n)         (0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n)                (0x205c + (n) * 4)
+#define              STATUS0_COMP_RESET_DONE         BIT(0)
+#define              STATUS0_COMP_REG_UPDATE0_DONE   BIT(1)
+#define              STATUS0_COMP_REG_UPDATE1_DONE   BIT(2)
+#define              STATUS0_COMP_REG_UPDATE2_DONE   BIT(3)
+#define              STATUS0_COMP_REG_UPDATE3_DONE   BIT(4)
+#define              STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
+#define              STATUS0_COMP0_BUF_DONE          BIT(5)
+#define              STATUS0_COMP1_BUF_DONE          BIT(6)
+#define              STATUS0_COMP2_BUF_DONE          BIT(7)
+#define              STATUS0_COMP3_BUF_DONE          BIT(8)
+#define              STATUS0_COMP4_BUF_DONE          BIT(9)
+#define              STATUS0_COMP5_BUF_DONE          BIT(10)
+#define              STATUS0_COMP_BUF_DONE(n)        BIT(n + 5)
+#define              STATUS0_COMP_ERROR              BIT(11)
+#define              STATUS0_COMP_OVERWRITE          BIT(12)
+#define              STATUS0_OVERFLOW                BIT(13)
+#define              STATUS0_VIOLATION               BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define              STATUS1_WM_CLIENT_BUF_DONE(n)           BIT(n)
+#define              STATUS1_EARLY_DONE                      BIT(24)
+#define              STATUS2_DUAL_COMP0_BUF_DONE             BIT(0)
+#define              STATUS2_DUAL_COMP1_BUF_DONE             BIT(1)
+#define              STATUS2_DUAL_COMP2_BUF_DONE             BIT(2)
+#define              STATUS2_DUAL_COMP3_BUF_DONE             BIT(3)
+#define              STATUS2_DUAL_COMP4_BUF_DONE             BIT(4)
+#define              STATUS2_DUAL_COMP5_BUF_DONE             BIT(5)
+#define              STATUS2_DUAL_COMP_BUF_DONE(n)           BIT(n)
+#define              STATUS2_DUAL_COMP_ERROR                 BIT(6)
+#define              STATUS2_DUAL_COMP_OVERWRITE             BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL             (0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG          (0x226c)
+#define              DEBUG_STATUS_CFG_STATUS0(n)     BIT(n)
+#define              DEBUG_STATUS_CFG_STATUS1(n)     BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER    (0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC         (0x2084)
+#define              BUS_VER2_MAX_CLIENTS (24)
+#define              WM_ADDR_NO_SYNC_DEFAULT_VAL \
+                             ((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE                      (0x200c)
+#define              WM_CGC_OVERRIDE_ALL             (0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL             (0x211c)
+
+#define VFE_BUS_WM_STATUS0(n)                        (0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n)                        (0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n)                    (0x2208 + (n) * 0x100)
+#define              WM_CFG_EN                       (0)
+#define              WM_CFG_MODE                     (1)
+#define                      MODE_QCOM_PLAIN (0)
+#define                      MODE_MIPI_RAW   (1)
+#define              WM_CFG_VIRTUALFRAME             (2)
+#define VFE_BUS_WM_HEADER_ADDR(n)            (0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n)             (0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n)             (0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n)              (0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n)               (0x221c + (n) * 0x100)
+#define              WM_BUFFER_DEFAULT_WIDTH         (0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n)              (0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n)             (0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n)                 (0x2228 + (n) * 0x100)
+#define              WM_STRIDE_DEFAULT_STRIDE        (0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n)   (0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n)  (0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n)               (0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n)              (0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n)                      (0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n)            (0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+     u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+     u32 gen = (hw_version >> 28) & 0xF;
+     u32 rev = (hw_version >> 16) & 0xFFF;
+     u32 step = hw_version & 0xFFFF;
+
+     dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+     u32 bits = readl_relaxed(vfe->base + reg);
+
+     writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{

drivers/media/platform/qcom/camss/camss-vfe-170.c line 233

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+     u32 reset_bits = GLOBAL_RESET_CMD_CORE          |
+                      GLOBAL_RESET_CMD_CAMIF         |
+                      GLOBAL_RESET_CMD_BUS           |
+                      GLOBAL_RESET_CMD_REGISTER      |
+                      GLOBAL_RESET_CMD_PM            |
+                      GLOBAL_RESET_CMD_BUS_MISR      |
+                      GLOBAL_RESET_CMD_IDLE_CGC      |
+                      GLOBAL_RESET_CMD_RDI0          |
+                      GLOBAL_RESET_CMD_RDI1          |
+                      GLOBAL_RESET_CMD_RDI2;

- so the reset_bits is set to 0x00001E77 in v5.

In v4 the reset_bits was set to 0x00003F9F which corresponds to:

          GLOBAL_RESET_CMD_CORE           |
          GLOBAL_RESET_CMD_CAMIF          |
          GLOBAL_RESET_CMD_BUS            |
          GLOBAL_RESET_CMD_BUS_BDG        |
          GLOBAL_RESET_CMD_REGISTER       |
          GLOBAL_RESET_CMD_TESTGEN        |
          GLOBAL_RESET_CMD_DSP            |
          GLOBAL_RESET_CMD_IDLE_CGC       |
          GLOBAL_RESET_CMD_RDI0           |
          GLOBAL_RESET_CMD_RDI1           |
          GLOBAL_RESET_CMD_RDI2           |
          GLOBAL_RESET_CMD_RDI3;

So the difference between v4 and v5 is:

reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP

reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR

Quoted 7 lines

- correct?

It is probably worth a few words in the v4 vs v5 changelog.

(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2 according to the driver code)

Great catch! I made a mistake with the bit-ordering after doing a hex->binary translation.
I'll straighten this out in v6.

Quoted 102 lines
Quoted 87 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +87 -0
+
+     writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+     /* Make sure IRQ mask has been written before resetting */
+     wmb();
+
+     writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+     u32 val;
+
+     /*Set Debug Registers*/
+     val = DEBUG_STATUS_CFG_STATUS0(1) |
+           DEBUG_STATUS_CFG_STATUS0(7);
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+     /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+     /* no clock gating at bus input */
+     val = WM_CGC_OVERRIDE_ALL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+     writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+     /* if addr_no_sync has default value then config the addr no sync reg */
+     val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+     writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+     val = WM_BUFFER_DEFAULT_WIDTH;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+     val = 0;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+     /* Configure stride for RDIs */
+     //val = pix->plane_fmt[0].bytesperline;
+     val = WM_STRIDE_DEFAULT_STRIDE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+     /* Enable WM */
+     val = 1 << WM_CFG_EN |
+           MODE_MIPI_RAW << WM_CFG_MODE;
+     writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+     /* Disable WM */
+     writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+                       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;
+
+     writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+     writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+     /* Enforce ordering between previous reg writes and reg update */
+     wmb();
+
+     writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+     /* Enforce ordering between reg update and subsequent reg writes */
+     wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+                                     enum vfe_line_id line_id)
+{
+     vfe->reg_update &= ~REG_UPDATE_RDI(line_id);

drivers/media/platform/qcom/camss/camss-vfe-170.c line 330

Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+     vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+     vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+     writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));

Looking at the #defines in the beginning of this file, only part of the IRQ sources (not the whole 32 per each register) are used or defined.

Quoted 2 lines

Is it safe to unmask the unused (reserved?) bits in the above 5 IRQ mask registers?

Unfortunately this register is not defined at all in any documentation of the downstream[1] kernel, so I think the situation is actually a bit worse than what you've pointed out here.
I'd like to remove the register defines above since I don't have a reliable source for them. But I would like to keep the register writes just as they are since that seems to work.

Quoted 4 lines
Quoted 1 line

What are your thoughts?

Without having the documentation, using the known good writes is fine. Removing the unused defines is also good.

Quoted 6 lines

Some of the register definitions like STATUS0_COMP_BUF_DONE is used currently, and are documented for later generations of this hardware. But I'm not finding any traces for this generation. Chances are that they are the same, but I cant guarantee it. But at least some of them seem to be correct, and are indeed needed. I'm tempted to leave this exactly the way it is. Would that be ok for you?

Yes, that's OK for me.

Thanks,
Andrey

Quoted 798 lines
Quoted 798 lines

Thanks,
Andrey

Quoted 794 lines

[1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845

Quoted 118 lines
Quoted 118 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +117 -0
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+     complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+     *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     /* Enforce ordering between IRQ Clear and Global IRQ Clear */
+     wmb();
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+     u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+     pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+     struct vfe_device *vfe = dev;
+     u32 status0, status1, vfe_bus_status[3];
+     int i, wm;
+
+     status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+     status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+     writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+     writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+             vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+             writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+     }
+
+     /* Enforce ordering between IRQ reading and interpretation */
+     wmb();
+
+     writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+     writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+     if (status0 & STATUS_0_RESET_ACK)
+             vfe->isr_ops.reset_ack(vfe);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+                     vfe->isr_ops.reg_update(vfe, i);
+
+     for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+             if (status0 & STATUS_1_RDI_SOF(i))
+                     vfe->isr_ops.sof(vfe, i);
+
+     for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+             if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+                     vfe->isr_ops.comp_done(vfe, i);
+
+     for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+             if (status0 & BIT(9))
+                     if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+                             vfe->isr_ops.wm_done(vfe, wm);
+
+     return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+     unsigned long time;
+
+     return 0;
+
+     reinit_completion(&vfe->halt_complete);
+
+     time = wait_for_completion_timeout(&vfe->halt_complete,
+             msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+     if (!time) {
+             dev_err(vfe->camss->dev, "VFE halt timeout\n");
+             return -EIO;
+     }
+
+     return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+     int i;
+     int wm_idx;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     output = &line->output;
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is running\n");
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 453

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+             goto error;
+     }
+
+     output->wm_num = 1;
+
+     for (i = 0; i < output->wm_num; i++) {

- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...

Ack.

Quoted 11 lines
Quoted 11 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +10 -0
+             wm_idx = vfe_reserve_wm(vfe, line->id);
+             if (wm_idx < 0) {
+                     dev_err(vfe->camss->dev, "Can not reserve wm\n");
+                     goto error_get_wm;
+             }
+             output->wm_idx[i] = wm_idx;
+     }
+
+     output->drop_update_idx = 0;
+
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe-170.c line 469

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +6 -0
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+
+error_get_wm:
+     for (i--; i >= 0; i--)

- ... and this one too. And the "i" local var is no longer needed.

Ack

Quoted 641 lines

Thanks,
Andrey

Quoted 637 lines
drivers/media/platform/qcom/camss/camss-vfe-170.c new file +321 -0
+             vfe_release_wm(vfe, output->wm_idx[i]);
+     output->state = VFE_OUTPUT_OFF;
+error:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     const struct vfe_hw_ops *ops = vfe->ops;
+     struct media_entity *sensor;
+     unsigned long flags;
+     unsigned int frame_skip = 0;
+     unsigned int i;
+
+     sensor = camss_find_sensor(&line->subdev.entity);
+     if (sensor) {
+             struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+             v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+             /* Max frame skip is 29 frames */
+             if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+                     frame_skip = VFE_FRAME_DROP_VAL - 1;
+     }
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     ops->reg_update_clear(vfe, line->id);
+
+     if (output->state != VFE_OUTPUT_OFF) {
+             dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+                     output->state);
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             return -EINVAL;
+     }
+
+     WARN_ON(output->gen2.active_num);
+
+     output->state = VFE_OUTPUT_ON;
+
+     output->sequence = 0;
+     output->wait_reg_update = 0;
+     reinit_completion(&output->reg_update);
+
+     vfe_wm_start(vfe, output->wm_idx[0], line);
+
+     for (i = 0; i < 2; i++) {
+             output->buf[i] = vfe_buf_get_pending(output);
+             if (!output->buf[i])
+                     break;
+             output->gen2.active_num++;
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+     }
+
+     ops->reg_update(vfe, line->id);
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output = &line->output;
+     unsigned long flags;
+     unsigned int i;
+     bool done;
+     int timeout = 0;
+
+     do {
+             spin_lock_irqsave(&vfe->output_lock, flags);
+             done = !output->gen2.active_num;
+             spin_unlock_irqrestore(&vfe->output_lock, flags);
+             usleep_range(10000, 20000);
+
+             if (timeout++ == 100) {
+                     dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+                     vfe_reset(vfe);
+                     output->gen2.active_num = 0;
+                     return 0;
+             }
+     } while (!done);
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     for (i = 0; i < output->wm_num; i++)
+             vfe_wm_stop(vfe, output->wm_idx[i]);
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+     int ret;
+
+     mutex_lock(&vfe->stream_lock);
+
+     if (!vfe->stream_count)
+             vfe_enable_irq_common(vfe);
+
+     vfe->stream_count++;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     ret = vfe_get_output(line);
+     if (ret < 0)
+             goto error_get_output;
+
+     ret = vfe_enable_output(line);
+     if (ret < 0)
+             goto error_enable_output;
+
+     vfe->was_streaming = 1;
+
+     return 0;
+
+
+error_enable_output:
+     vfe_put_output(line);
+
+error_get_output:
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+     struct vfe_device *vfe = to_vfe(line);
+
+     vfe_disable_output(line);
+
+     vfe_put_output(line);
+
+     mutex_lock(&vfe->stream_lock);
+
+     vfe->stream_count--;
+
+     mutex_unlock(&vfe->stream_lock);
+
+     return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+     struct vfe_output *output;
+     unsigned long flags;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+     vfe->ops->reg_update_clear(vfe, line_id);
+
+     output = &vfe->line[line_id].output;
+
+     if (output->wait_reg_update) {
+             output->wait_reg_update = 0;
+             complete(&output->reg_update);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+     struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+     struct camss_buffer *ready_buf;
+     struct vfe_output *output;
+     unsigned long flags;
+     u32 index;
+     u64 ts = ktime_get_ns();
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Received wm done for unmapped index\n");
+             goto out_unlock;
+     }
+     output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+     ready_buf = output->buf[0];
+     if (!ready_buf) {
+             dev_err_ratelimited(vfe->camss->dev,
+                                 "Missing ready buf %d!\n", output->state);
+             goto out_unlock;
+     }
+
+     ready_buf->vb.vb2_buf.timestamp = ts;
+     ready_buf->vb.sequence = output->sequence++;
+
+     index = 0;
+     output->buf[0] = output->buf[1];
+     if (output->buf[0])
+             index = 1;
+
+     output->buf[index] = vfe_buf_get_pending(output);
+
+     if (output->buf[index])
+             vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+     else
+             output->gen2.active_num--;
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+     return;
+
+out_unlock:
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+                         struct camss_buffer *buf)
+{
+     struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+     struct vfe_device *vfe = to_vfe(line);
+     struct vfe_output *output;
+     unsigned long flags;
+
+     output = &line->output;
+
+     spin_lock_irqsave(&vfe->output_lock, flags);
+
+     if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+             output->buf[output->gen2.active_num++] = buf;
+             vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+     } else {
+             vfe_buf_add_pending(output, buf);
+     }
+
+     spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+     return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+     .reset_ack = vfe_isr_reset_ack,
+     .halt_ack = vfe_isr_halt_ack,
+     .reg_update = vfe_isr_reg_update,
+     .sof = vfe_isr_sof,
+     .comp_done = vfe_isr_comp_done,
+     .wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+     .queue_buffer = vfe_queue_buffer,
+     .flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+     vfe->isr_ops = vfe_isr_ops_170;
+     vfe->video_ops = vfe_video_ops_170;
+
+     vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+     .global_reset = vfe_global_reset,
+     .hw_version_read = vfe_hw_version_read,
+     .isr_read = vfe_isr_read,
+     .isr = vfe_isr,
+     .reg_update_clear = vfe_reg_update_clear,
+     .reg_update = vfe_reg_update,
+     .subdev_init = vfe_subdev_init,
+     .vfe_disable = vfe_disable,
+     .vfe_enable = vfe_enable,
+     .vfe_halt = vfe_halt,
+     .violation_read = vfe_violation_read,
+};
drivers/media/platform/qcom/camss/camss-vfe.c +38 -9
index 375843bd16af..6fafeb8a5484 100644
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
        { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
    };
 
+static const struct vfe_format formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+     { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+     { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+     { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+     { MEDIA_BUS_FMT_Y10_1X10, 10 },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
    /*
     * vfe_get_bpp - map media bus format to bits per pixel
     * @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                        return sink_code;
                }
        else if (vfe->camss->version == CAMSS_8x96 ||
-              vfe->camss->version == CAMSS_660)
+              vfe->camss->version == CAMSS_660 ||
+              vfe->camss->version == CAMSS_845)
                switch (sink_code) {
                case MEDIA_BUS_FMT_YUYV8_2X8:
                {
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                return 0;
    }
 
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
    {
        unsigned long time;
 
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
                struct camss_clock *clock = &vfe->clock[i];
 
                if (!strcmp(clock->name, "vfe0") ||
-                 !strcmp(clock->name, "vfe1")) {
+                 !strcmp(clock->name, "vfe1") ||
+                 !strcmp(clock->name, "vfe_lite")) {
                        u64 min_rate = 0;
                        long rate;
 
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
        case CAMSS_660:
                vfe->ops = &vfe_ops_4_8;
                break;
+
+     case CAMSS_845:
+             vfe->ops = &vfe_ops_170;
+             break;
        default:
                return -EINVAL;
        }
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
                                l->formats = formats_rdi_8x96;
                                l->nformats = ARRAY_SIZE(formats_rdi_8x96);
                        }
+             } else if (camss->version == CAMSS_845) {
+                     l->formats = formats_rdi_845;
+                     l->nformats = ARRAY_SIZE(formats_rdi_845);
                } else {
                        return -EINVAL;
                }
drivers/media/platform/qcom/camss/camss-vfe.h +15 -11
index aad5dc74c2c0..29b3d930ffc6 100644
@@ -19,7 +19,6 @@
    #include "camss-video.h"
    #include "camss-vfe-gen1.h"
 
-
    #define MSM_VFE_PAD_SINK 0
    #define MSM_VFE_PAD_SRC 1
    #define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
    #define to_vfe(ptr_line)    \
        container_of(vfe_line_array(ptr_line), struct vfe_device, line)
 
-
    enum vfe_output_state {
        VFE_OUTPUT_OFF,
        VFE_OUTPUT_RESERVED,
        VFE_OUTPUT_SINGLE,
        VFE_OUTPUT_CONTINUOUS,
        VFE_OUTPUT_IDLE,
-     VFE_OUTPUT_STOPPING
+     VFE_OUTPUT_STOPPING,
+     VFE_OUTPUT_ON,
    };
 
    enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
        VFE_LINE_RDI0 = 0,
        VFE_LINE_RDI1 = 1,
        VFE_LINE_RDI2 = 2,
+     VFE_LINE_NUM_GEN2 = 3,
        VFE_LINE_PIX = 3,
        VFE_LINE_NUM_GEN1 = 4,
        VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
                        int active_buf;
                        int wait_sof;
                } gen1;
+             struct {
+                     int active_num;
+             } gen2;
        };
        enum vfe_output_state state;
        unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
 
    struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
 
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
    int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
 
    /*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
    int vfe_release_wm(struct vfe_device *vfe, u8 wm);
    int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
 
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
    extern const struct vfe_hw_ops vfe_ops_4_1;
    extern const struct vfe_hw_ops vfe_ops_4_7;
    extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
 
    #endif /* QC_MSM_CAMSS_VFE_H */
drivers/media/platform/qcom/camss/camss-video.c +52 -0
index 97cea7c4d769..f282275af626 100644
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
          { { 1, 1 } }, { { 1, 1 } }, { 16 } },
    };
 
+static const struct camss_format_info formats_rdi_845[] = {
+     { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+     { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+     { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+     { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+     { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+     { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+       { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
    static const struct camss_format_info formats_pix_8x16[] = {
        { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
          { { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
                        video->formats = formats_rdi_8x96;
                        video->nformats = ARRAY_SIZE(formats_rdi_8x96);
                }
+     }  else if (video->camss->version == CAMSS_845) {
+             video->formats = formats_rdi_845;
+             video->nformats = ARRAY_SIZE(formats_rdi_845);
        } else {
                ret = -EINVAL;
                goto error_video_register;
drivers/media/platform/qcom/camss/camss.c +61 -0
index 6c6f1e59ccd8..0e006def1996 100644
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
        }
    };
 
+static const struct resources vfe_res_845[] = {
+     /* VFE0 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe0", "vfe0_axi",
+                             "vfe0_src", "csi0",
+                             "csi0_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe0" },
+             .interrupt = { "vfe0" }
+     },
+
+     /* VFE1 */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe1", "vfe1_axi",
+                             "vfe1_src", "csi1",
+                             "csi1_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 0 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe1" },
+             .interrupt = { "vfe1" }
+     },
+
+     /* VFE-lite */
+     {
+             .regulator = { NULL },
+             .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+                             "soc_ahb", "vfe_lite",
+                             "vfe_lite_src", "csi2",
+                             "csi2_src"},
+             .clock_rate = { { 0 },
+                             { 0 },
+                             { 80000000 },
+                             { 0 },
+                             { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+                             { 320000000 },
+                             { 19200000, 75000000, 384000000, 538666667 },
+                             { 384000000 } },
+             .reg = { "vfe_lite" },
+             .interrupt = { "vfe_lite" }
+     }
+};
+
    /*
     * camss_add_clock_margin - Add margin to clock frequency rate
     * @rate: Clock frequency rate