[PATCH 0/6] qcom: camss: dts: Prune and tidy x13s, rb5 and rb3 CAMSS dts

[PATCH 0/6] qcom: camss: dts: Prune and tidy x13s, rb5 and rb3 CAMSS dts

[Bryan O'Donoghue]

This series does a refresh on upstream x13s, rb5 and rb3 dts.

Firstly:
Moving from static dts files for the mezzanine cards to dtso.
A recent examples of this approach is here:

Commit: bc90f56a1699 ("arm64: dts: sm8650-hdk: add support for the Display Card overlay")

Taking this example this series converts rb3 and rb5 to the same overlay
format. The apq8016-sbc-d3-camera-mezzanine.dtb is omitted from this series
as I haven't had an opportunity to test on this platform but, will do so at
a later date.

Secondly:
rb3 and rb5 both declare clock-lanes in their respective sensor blocks.
Neither sensor actually requires this declaration.

Drop in both cases.

Finally:
Declare CMA heaps for both mezzanine boards so that libcamera's DMA buf
will work with upstream rb3/rb5 camera mezzanine boards.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
Bryan O'Donoghue (6):
      arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Convert mezzanine riser to dtbo
      arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to dtso
      arm64: dts: qcom: sc8280xp-x13s: Drop redundant clock-lanes from camera@10
      arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop redundant clock-lanes from camera@1a
      arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add cma heap for libcamera softisp support
      arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

 arch/arm64/boot/dts/qcom/Makefile                    |  6 ++++++
 ...zzanine.dts => qrb5165-rb5-vision-mezzanine.dtso} | 19 +++++++++++++++++--
 .../boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts  |  1 -
 ...e.dts => sdm845-db845c-navigation-mezzanine.dtso} | 20 ++++++++++++++++++--
 4 files changed, 41 insertions(+), 5 deletions(-)
---
base-commit: a39230ecf6b3057f5897bc4744a790070cfbe7a8
change-id: 20241025-b4-linux-next-24-10-25-camss-dts-fixups-1a094dc5a60f

Best regards,
-- 
Bryan O'Donoghue <bryan.odonoghue@linaro.org>

[PATCH 1/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Convert mezzanine riser to dtbo

[Bryan O'Donoghue]

Convert the navigation / camera mezzanine from its own dts to a dtso. A
small amount of additional includes / address / cell size change needs to
be applied to convert.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb5
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/Makefile                                  | 3 +++
 ...-rb5-vision-mezzanine.dts => qrb5165-rb5-vision-mezzanine.dtso} | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index ac199f809b0d4e514878518604a23b4f1ab8ef79..7145748afaf53c816e7b3efd8d5f583a2efbb82e 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -116,6 +116,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= qdu1000-idp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qrb2210-rb1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qrb4210-rb2.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5.dtb
+
+qrb5165-rb5-vision-mezzanine-dtbs	:= qrb5165-rb5.dtb qrb5165-rb5-vision-mezzanine.dtbo
+
 dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5-vision-mezzanine.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qru1000-idp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sa8155p-adp.dtb
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
similarity index 88%
rename from arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts
rename to arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
index edc0e42ee01735eda96b2c5c68be247ea37cd534..0603954e24d88fa203679279f01705eea15ce6c3 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
@@ -4,8 +4,10 @@
  */
 
 /dts-v1/;
+/plugin/;
 
-#include "qrb5165-rb5.dts"
+#include <dt-bindings/clock/qcom,camcc-sm8250.h>
+#include <dt-bindings/gpio/gpio.h>
 
 &camcc {
 	status = "okay";
@@ -33,6 +35,9 @@ &cci1 {
 };
 
 &cci1_i2c0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
 	camera@1a {
 		compatible = "sony,imx577";
 		reg = <0x1a>;

-- 
2.47.0

[PATCH 2/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to dtso

[Bryan O'Donoghue]

Convert the navigation / camera mezzanine from its own dts to a dtso. A
small amount of additional includes / address / cell size change needs to
be applied to convert.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb3
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/Makefile                                  | 3 +++
 ...ation-mezzanine.dts => sdm845-db845c-navigation-mezzanine.dtso} | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 7145748afaf53c816e7b3efd8d5f583a2efbb82e..1660c8a95f677847c405bcee42cc5e26d8a98d51 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -211,6 +211,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r2.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-db845c.dtb
+
+sdm845-db845c-navigation-mezzanine.dtbs	:= sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo
+
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-db845c-navigation-mezzanine.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-lg-judyln.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-lg-judyp.dtb
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
similarity index 93%
rename from arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts
rename to arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
index a21caa6f3fa2594df2f08e48adeeaefd7a33396e..d62a20f018e7a7e1c7e77f0c927c2d9fe7ae8509 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
@@ -4,8 +4,10 @@
  */
 
 /dts-v1/;
+/plugin/;
 
-#include "sdm845-db845c.dts"
+#include <dt-bindings/clock/qcom,camcc-sdm845.h>
+#include <dt-bindings/gpio/gpio.h>
 
 &camss {
 	vdda-phy-supply = <&vreg_l1a_0p875>;
@@ -28,6 +30,9 @@ &cci {
 };
 
 &cci_i2c0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
 	camera@10 {
 		compatible = "ovti,ov8856";
 		reg = <0x10>;

-- 
2.47.0

[PATCH 3/6] arm64: dts: qcom: sc8280xp-x13s: Drop redundant clock-lanes from camera@10

[Bryan O'Donoghue]

clock-lanes does nothing here - the sensor doesn't care about this
property, remove it.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # x13s
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 83208b10f994b282ed50c3ba8a82298b6fc50deb..15f59b622bcd4250f43d329fd9a371ae4d0a73c6 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -633,7 +633,6 @@ camera@10 {
 
 		port {
 			ov5675_ep: endpoint {
-				clock-lanes = <0>;
 				data-lanes = <1 2>;
 				link-frequencies = /bits/ 64 <450000000>;
 				remote-endpoint = <&csiphy0_lanes01_ep>;

-- 
2.47.0

[PATCH 4/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop redundant clock-lanes from camera@1a

[Bryan O'Donoghue]

Remove redundant clock-lanes property. The sensor doesn't require
clock-lanes at all. Remove now.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb5
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
index 0603954e24d88fa203679279f01705eea15ce6c3..5fe331923dd3cd31ff2be047a2228e1c4104e80e 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
@@ -57,7 +57,6 @@ camera@1a {
 
 		port {
 			imx577_ep: endpoint {
-				clock-lanes = <1>;
 				link-frequencies = /bits/ 64 <600000000>;
 				data-lanes = <1 2 3 4>;
 				remote-endpoint = <&csiphy2_ep>;

-- 
2.47.0

[PATCH 5/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add cma heap for libcamera softisp support

[Bryan O'Donoghue]

libcamera softisp requires a linux,cma heap export in order to support
user-space debayering, 3a and export to other system components such as
pipewire, Firefox/Chromium - Hangouts, Zoom etc.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
index 5fe331923dd3cd31ff2be047a2228e1c4104e80e..ae256c713a36078afdadc67193f381a19ea8e5d3 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
@@ -9,6 +9,17 @@
 #include <dt-bindings/clock/qcom,camcc-sm8250.h>
 #include <dt-bindings/gpio/gpio.h>
 
+/ {
+	reserved-memory {
+		linux,cma {
+			compatible = "shared-dma-pool";
+			size = <0x0 0x8000000>;
+			reusable;
+			linux,cma-default;
+		};
+	};
+};
+
 &camcc {
 	status = "okay";
 };

-- 
2.47.0

[PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Bryan O'Donoghue]

libcamera softisp requires a linux,cma heap export in order to support
user-space debayering, 3a and export to other system components such as
pipewire, Firefox/Chromium - Hangouts, Zoom etc.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
index d62a20f018e7a7e1c7e77f0c927c2d9fe7ae8509..c8507afcd1e0d1f9b14b6e4edcbc646032e7b6c9 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
@@ -9,6 +9,17 @@
 #include <dt-bindings/clock/qcom,camcc-sdm845.h>
 #include <dt-bindings/gpio/gpio.h>
 
+/ {
+	reserved-memory {
+		linux,cma {
+			compatible = "shared-dma-pool";
+			size = <0x0 0x8000000>;
+			reusable;
+			linux,cma-default;
+		};
+	};
+};
+
 &camss {
 	vdda-phy-supply = <&vreg_l1a_0p875>;
 	vdda-pll-supply = <&vreg_l26a_1p2>;

-- 
2.47.0

Re: [PATCH 3/6] arm64: dts: qcom: sc8280xp-x13s: Drop redundant clock-lanes from camera@10

[Konrad Dybcio]

On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
> clock-lanes does nothing here - the sensor doesn't care about this
> property, remove it.
> 
> Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # x13s
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---

drivers/media/platform/qcom/camss/camss.c : camss_of_parse_endpoint_node()

seems to reference it and pass it on to the PHY drivers

Konrad

Re: [PATCH 1/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Convert mezzanine riser to dtbo

[Konrad Dybcio]

On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
> Convert the navigation / camera mezzanine from its own dts to a dtso. A
> small amount of additional includes / address / cell size change needs to
> be applied to convert.
> 
> Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb5
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 2/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to dtso

[Konrad Dybcio]

On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
> Convert the navigation / camera mezzanine from its own dts to a dtso. A
> small amount of additional includes / address / cell size change needs to
> be applied to convert.
> 
> Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb3
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 5/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add cma heap for libcamera softisp support

[Konrad Dybcio]

On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
> libcamera softisp requires a linux,cma heap export in order to support
> user-space debayering, 3a and export to other system components such as
> pipewire, Firefox/Chromium - Hangouts, Zoom etc.
> 
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---

Probably could use an inline comment

In any case

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Konrad Dybcio]

On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
> libcamera softisp requires a linux,cma heap export in order to support
> user-space debayering, 3a and export to other system components such as
> pipewire, Firefox/Chromium - Hangouts, Zoom etc.
> 
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---

Same as patch 5

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 3/6] arm64: dts: qcom: sc8280xp-x13s: Drop redundant clock-lanes from camera@10

[Bryan O'Donoghue]

On 25/10/2024 18:23, Konrad Dybcio wrote:
> On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote:
>> clock-lanes does nothing here - the sensor doesn't care about this
>> property, remove it.
>>
>> Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # x13s
>> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>> ---
> 
> drivers/media/platform/qcom/camss/camss.c : camss_of_parse_endpoint_node()
> 
> seems to reference it and pass it on to the PHY drivers
> 
> Konrad

Yep but that parses the clock-lane indicator in camss ports

&camss {
         vdda-phy-supply = <&vreg_l6d>;
         vdda-pll-supply = <&vreg_l4d>;

         status = "okay";

         ports {
                 port@0 {
                         csiphy0_lanes01_ep: endpoint@0 {
                                 reg = <0>; // HERE
                                 clock-lanes = <7>;
                                 data-lanes = <0 1>;
                                 remote-endpoint = <&ov5675_ep>;
                         };
                 };
         };
};

this patch and its sister patch remove clock-lanes form the sensor

&cci2_i2c1 {
         camera@10 {

		<snip>
                 port {
                         ov5675_ep: endpoint {
				clock-lanes = <0>;//HERE
                                 data-lanes = <1 2>;
				<snip>
                         };
                 };

         };
};

This is removing the camera@10{} clock-lanes not the camss{} clock lanes 
which you're right is referenced.

---
bod

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Rob Clark]

On Fri, Oct 25, 2024 at 8:49 AM Bryan O'Donoghue
<bryan.odonoghue@linaro.org> wrote:
>
> libcamera softisp requires a linux,cma heap export in order to support
> user-space debayering, 3a and export to other system components such as
> pipewire, Firefox/Chromium - Hangouts, Zoom etc.

AFAIU libcamera could use udmabuf, etc, and there is no hw requirement
for CMA.  So it doesn't seem we should be adding this to dt.  And I'd
really prefer that we not be using CMA just for lolz.

BR,
-R

> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
>  .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso     | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> index d62a20f018e7a7e1c7e77f0c927c2d9fe7ae8509..c8507afcd1e0d1f9b14b6e4edcbc646032e7b6c9 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> @@ -9,6 +9,17 @@
>  #include <dt-bindings/clock/qcom,camcc-sdm845.h>
>  #include <dt-bindings/gpio/gpio.h>
>
> +/ {
> +       reserved-memory {
> +               linux,cma {
> +                       compatible = "shared-dma-pool";
> +                       size = <0x0 0x8000000>;
> +                       reusable;
> +                       linux,cma-default;
> +               };
> +       };
> +};
> +
>  &camss {
>         vdda-phy-supply = <&vreg_l1a_0p875>;
>         vdda-pll-supply = <&vreg_l26a_1p2>;
>
> --
> 2.47.0
>
>

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Kieran Bingham]

+Cc Laurent

Quoting Rob Clark (2024-11-01 12:33:44)
> On Fri, Oct 25, 2024 at 8:49 AM Bryan O'Donoghue
> <bryan.odonoghue@linaro.org> wrote:
> >
> > libcamera softisp requires a linux,cma heap export in order to support
> > user-space debayering, 3a and export to other system components such as
> > pipewire, Firefox/Chromium - Hangouts, Zoom etc.
> 
> AFAIU libcamera could use udmabuf, etc, and there is no hw requirement
> for CMA.  So it doesn't seem we should be adding this to dt.  And I'd
> really prefer that we not be using CMA just for lolz.

I agree here. Otherwise this theoretically locks this memory to the pool
'forever'. It's not something we should define in device tree.

udmabuf provides a means to get memfd allocated memory which is not
physically contiguous - but /is/ managed by a dmabuf handle.

Presently with SoftISP being CPU only - physically contiguous memory is
not required.

Bryan, will this still be true when you have a GPU based ISP ? Will that
require physically contiguous memory ? Or will the mapping into the GPU
handle any required translations?

--
Kieran


> 
> BR,
> -R
> 
> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> > ---
> >  .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso     | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > index d62a20f018e7a7e1c7e77f0c927c2d9fe7ae8509..c8507afcd1e0d1f9b14b6e4edcbc646032e7b6c9 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > @@ -9,6 +9,17 @@
> >  #include <dt-bindings/clock/qcom,camcc-sdm845.h>
> >  #include <dt-bindings/gpio/gpio.h>
> >
> > +/ {
> > +       reserved-memory {
> > +               linux,cma {
> > +                       compatible = "shared-dma-pool";
> > +                       size = <0x0 0x8000000>;
> > +                       reusable;
> > +                       linux,cma-default;
> > +               };
> > +       };
> > +};
> > +
> >  &camss {
> >         vdda-phy-supply = <&vreg_l1a_0p875>;
> >         vdda-pll-supply = <&vreg_l26a_1p2>;
> >
> > --
> > 2.47.0
> >
> >

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Rob Clark]

On Fri, Nov 1, 2024 at 8:18 AM Kieran Bingham
<kieran.bingham@ideasonboard.com> wrote:
>
> +Cc Laurent
>
> Quoting Rob Clark (2024-11-01 12:33:44)
> > On Fri, Oct 25, 2024 at 8:49 AM Bryan O'Donoghue
> > <bryan.odonoghue@linaro.org> wrote:
> > >
> > > libcamera softisp requires a linux,cma heap export in order to support
> > > user-space debayering, 3a and export to other system components such as
> > > pipewire, Firefox/Chromium - Hangouts, Zoom etc.
> >
> > AFAIU libcamera could use udmabuf, etc, and there is no hw requirement
> > for CMA.  So it doesn't seem we should be adding this to dt.  And I'd
> > really prefer that we not be using CMA just for lolz.
>
> I agree here. Otherwise this theoretically locks this memory to the pool
> 'forever'. It's not something we should define in device tree.
>
> udmabuf provides a means to get memfd allocated memory which is not
> physically contiguous - but /is/ managed by a dmabuf handle.
>
> Presently with SoftISP being CPU only - physically contiguous memory is
> not required.
>
> Bryan, will this still be true when you have a GPU based ISP ? Will that
> require physically contiguous memory ? Or will the mapping into the GPU
> handle any required translations?

GPU does not require phys contiguous.  OTOH it may/will impose some
layout constraints.

I'm kinda leaning towards teaching gbm to allocate YUV plus add a
GBO_BO_USE_CPU usage bit if softisp also needs CPU access.  (Modern
adreno can do cached-coherent buffers, at some small performance cost,
so that CPU access doesn't have to fall off a cliff.)  But that
doesn't exist yet.

BR,
-R

>
> --
> Kieran
>
>
> >
> > BR,
> > -R
> >
> > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> > > ---
> > >  .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso     | 11 +++++++++++
> > >  1 file changed, 11 insertions(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > > index d62a20f018e7a7e1c7e77f0c927c2d9fe7ae8509..c8507afcd1e0d1f9b14b6e4edcbc646032e7b6c9 100644
> > > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
> > > @@ -9,6 +9,17 @@
> > >  #include <dt-bindings/clock/qcom,camcc-sdm845.h>
> > >  #include <dt-bindings/gpio/gpio.h>
> > >
> > > +/ {
> > > +       reserved-memory {
> > > +               linux,cma {
> > > +                       compatible = "shared-dma-pool";
> > > +                       size = <0x0 0x8000000>;
> > > +                       reusable;
> > > +                       linux,cma-default;
> > > +               };
> > > +       };
> > > +};
> > > +
> > >  &camss {
> > >         vdda-phy-supply = <&vreg_l1a_0p875>;
> > >         vdda-pll-supply = <&vreg_l26a_1p2>;
> > >
> > > --
> > > 2.47.0
> > >
> > >

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support

[Bryan O'Donoghue]

On 01/11/2024 15:18, Kieran Bingham wrote:
> Presently with SoftISP being CPU only - physically contiguous memory is
> not required.

Yes, I've misinterpreted what we discussed, udmabuf should be enough on 
qcom.

> Bryan, will this still be true when you have a GPU based ISP ? Will that
> require physically contiguous memory ? Or will the mapping into the GPU
> handle any required translations?

I believe it should be fine because we do glTexImage2D on the way in ATM 
and have support for eglCreateImageKHR(.., .., .., .., .., 
   EGL_DMA_BUF_PLANE0_FD_EXT, dma_fd); but in either case phys contig 
doesn't matter.

---
bod

Re: [PATCH 0/6] qcom: camss: dts: Prune and tidy x13s, rb5 and rb3 CAMSS dts

[Bjorn Andersson]

On Fri, 25 Oct 2024 16:43:22 +0100, Bryan O'Donoghue wrote:
> This series does a refresh on upstream x13s, rb5 and rb3 dts.
> 
> Firstly:
> Moving from static dts files for the mezzanine cards to dtso.
> A recent examples of this approach is here:
> 
> Commit: bc90f56a1699 ("arm64: dts: sm8650-hdk: add support for the Display Card overlay")
> 
> [...]

Applied, thanks!

[1/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Convert mezzanine riser to dtbo
      commit: 231c03c6119d98ae26c7fe72c3281091eb41a35e
[2/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to dtso
      commit: 30df676a31b7a4881352097d8ae7c2bb83515a17
[3/6] arm64: dts: qcom: sc8280xp-x13s: Drop redundant clock-lanes from camera@10
      commit: ec83cf7581bd0a03e2a4a7145ffb4eda1f2e243a
[4/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop redundant clock-lanes from camera@1a
      commit: 2d444a792b3c3d763e291f05402c4650d4ae7a9b
[5/6] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add cma heap for libcamera softisp support
      commit: 99d557cfe4fcf89664762796678e26009aa3bdd9
[6/6] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support
      commit: d40fd02c1faf8faad57a7579b573bc5be51faabe

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>