| Message ID | 20250227-qcom-nonroot-overlays-v2-2-bde44f708cbe@trvn.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4de3e8d657f2111dd8d45c2ba0eef8b2437b85f2 |
| Headers | show |
| Series | {vision/navigation}-mezzanine: Fix overlay root node | expand |
On 27/02/2025 14:26, Nikita Travkin wrote: > Initially added, the cma heap was supposed to help with libcamera swisp, > however a mistake was made such that the node was never applied as part > of the overlay since the change was added to the overlay root ("/") and > not with a reference to the target dtb root ("&{/}"). Moveover libcamera > doesn't require CMA heap on Qualcomm platforms anymore as it can now use > UDMA buffers instead. > > Drop the CMA heap node. This change has no effect on the final dtb. > > This reverts commit d40fd02c1faf8faad57a7579b573bc5be51faabe. > > Fixes: d40fd02c1faf ("arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support") > Suggested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Nikita Travkin <nikita@trvn.ru> > --- > .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso | 11 ----------- > 1 file changed, 11 deletions(-) > > 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 59970082da45203311146cc5249298f6188bf67a..51f1a4883ab8f0ee7c66fab89c6e1a88c868d2f8 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso > @@ -9,17 +9,6 @@ > #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>; > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
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 59970082da45203311146cc5249298f6188bf67a..51f1a4883ab8f0ee7c66fab89c6e1a88c868d2f8 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso @@ -9,17 +9,6 @@ #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>;
Initially added, the cma heap was supposed to help with libcamera swisp, however a mistake was made such that the node was never applied as part of the overlay since the change was added to the overlay root ("/") and not with a reference to the target dtb root ("&{/}"). Moveover libcamera doesn't require CMA heap on Qualcomm platforms anymore as it can now use UDMA buffers instead. Drop the CMA heap node. This change has no effect on the final dtb. This reverts commit d40fd02c1faf8faad57a7579b573bc5be51faabe. Fixes: d40fd02c1faf ("arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Add cma heap for libcamera softisp support") Suggested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Nikita Travkin <nikita@trvn.ru> --- .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso | 11 ----------- 1 file changed, 11 deletions(-)