| Message ID | 20250227-qcom-nonroot-overlays-v2-1-bde44f708cbe@trvn.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2a26a02e668ff101580647221c898d75ed93f8f5 |
| 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 99d557cfe4fcf89664762796678e26009aa3bdd9. > > Fixes: 99d557cfe4fc ("arm64: dts: qcom: qrb5165-rb5-vision-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> > --- > arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 11 ----------- > 1 file changed, 11 deletions(-) > > 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 ae256c713a36078afdadc67193f381a19ea8e5d3..5fe331923dd3cd31ff2be047a2228e1c4104e80e 100644 > --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso > +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso > @@ -9,17 +9,6 @@ > #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"; > }; > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
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 ae256c713a36078afdadc67193f381a19ea8e5d3..5fe331923dd3cd31ff2be047a2228e1c4104e80e 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso @@ -9,17 +9,6 @@ #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"; };
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 99d557cfe4fcf89664762796678e26009aa3bdd9. Fixes: 99d557cfe4fc ("arm64: dts: qcom: qrb5165-rb5-vision-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> --- arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 11 ----------- 1 file changed, 11 deletions(-)