On 14.03.2023 05:58, Caleb Connolly wrote:
> Almost all of the SDM845 devices actually map the same region for the
> continuous splash / framebuffer. de-dup all the devices that specify it
> manually and put it in sdm845.dtsi instead.
>
> This now reserves it on the OnePlus 6 where it was not reserved before,
> this is intentional.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@xxxxxxxxxx>
> ---
You didn't explain why is not done on 850 (which I assume has to do with
the windows memory map being different and putting it somewhere else) and
the reasoning for reserving it at all.
If that's the framebuffer handoff issue with smmu faults happening, it may
be worth looking into solving that properly, i.e. introducing something like
qcom,framebuffer which would suck up the starting address and figure out the
required size based on MDP5 VIG pipes' registers and could tickle the
autorefresh regs if needed. See how lk2nd does it, the hardware underneath
hasn't changed since msm8974.
Then, on drm handoff it could free the memory and let drm/msm initialize
its own, new, dynamically-allocated and dynamically-sized region as it wants.
Or we can use mdss's never-used memory-region property, but that would
kill 35 or so megs of ram for everyone, no matter display their resolution.
Konrad
> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------
> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 -----
> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 -----
> arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------
> .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++
> arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++
> 7 files changed, 7 insertions(+), 28 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> index f942c5afea9b..6a1c674a015b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> @@ -93,12 +93,6 @@ spss_mem: memory@99000000 {
> no-map;
> };
>
> - /* Framebuffer region */
> - memory@9d400000 {
> - reg = <0x0 0x9d400000 0x0 0x2400000>;
> - no-map;
> - };
> -
> /* rmtfs lower guard */
> memory@f0800000 {
> reg = <0 0xf0800000 0 0x1000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> index d37a433130b9..7c2457948a32 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 {
> };
>
> reserved-memory {
> - memory@9d400000 {
> - reg = <0x0 0x9d400000 0x0 0x02400000>;
> - no-map;
> - };
> -
> memory@a1300000 {
> compatible = "ramoops";
> reg = <0x0 0xa1300000 0x0 0x100000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> index b54e304abf71..4f6b1053c15b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -60,11 +60,6 @@ key-vol-up {
> };
>
> reserved-memory {
> - framebuffer_region@9d400000 {
> - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>;
> - no-map;
> - };
> -
> ramoops: ramoops@b0000000 {
> compatible = "ramoops";
> reg = <0 0xb0000000 0 0x00400000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> index 4984c7496c31..7e273cc0158d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 {
> };
>
> reserved-memory {
> - /* SONY was cool and didn't diverge from MTP this time, yay! */
> - cont_splash_mem: memory@9d400000 {
> - reg = <0x0 0x9d400000 0x0 0x2400000>;
> - no-map;
> - };
> -
> ramoops@ffc00000 {
> compatible = "ramoops";
> reg = <0x0 0xffc00000 0x0 0x100000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index e0fda4d754fe..191c2664f721 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 {
> no-map;
> };
>
> - /* Cont splash region set up by the bootloader */
> - cont_splash_mem: framebuffer@9d400000 {
> - reg = <0 0x9d400000 0 0x2400000>;
> - no-map;
> - };
> -
> rmtfs_mem: memory@f6301000 {
> compatible = "qcom,rmtfs-mem";
> reg = <0 0xf6301000 0 0x200000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index 479859bd8ab3..ecec2ee46683 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 {
> no-map;
> };
>
> + cont_splash_mem: framebuffer@9d400000 {
> + reg = <0 0x9d400000 0 0x2400000>;
> + no-map;
> + };
> +
> mdata_mem: mpss-metadata {
> alloc-ranges = <0 0xa0000000 0 0x20000000>;
> size = <0 0x4000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi
> index da9f6fbe32f6..b787575c77a5 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi
> @@ -7,6 +7,8 @@
>
> #include "sdm845.dtsi"
>
> +/delete-node/ &cont_splash_mem;
> +
> &cpu4_opp_table {
> cpu4_opp33: opp-2841600000 {
> opp-hz = /bits/ 64 <2841600000>;
