Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Dmitry Baryshkov]

From: Amit Pundir <amit.pundir@linaro.org>

This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.

This upstream commit broke AOSP (post Android 12 merge) build
on RB5. The device either silently crashes into USB crash mode
after android boot animation or we see a blank blue screen
with following dpu errors in dmesg:

[  T444] hw recovery is not complete for ctl:3
[  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22
[  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
[  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
[    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout
[  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
[  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 8c15d9fed08f..d12e4cbfc852 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2590,9 +2590,10 @@
 			power-domains = <&dispcc MDSS_GDSC>;
 
 			clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
+				 <&gcc GCC_DISP_HF_AXI_CLK>,
 				 <&gcc GCC_DISP_SF_AXI_CLK>,
 				 <&dispcc DISP_CC_MDSS_MDP_CLK>;
-			clock-names = "iface", "nrt_bus", "core";
+			clock-names = "iface", "bus", "nrt_bus", "core";
 
 			assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
 			assigned-clock-rates = <460000000>;
-- 
cgit v1.2.1

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Steev Klimaszewski]

On 10/14/21 8:54 AM, Dmitry Baryshkov wrote:
> From: Amit Pundir <amit.pundir@linaro.org>
>
> This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
>
> This upstream commit broke AOSP (post Android 12 merge) build
> on RB5. The device either silently crashes into USB crash mode
> after android boot animation or we see a blank blue screen
> with following dpu errors in dmesg:
>
> [  T444] hw recovery is not complete for ctl:3
> [  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22
> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> [    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout
> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
>
> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> ---
>   arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index 8c15d9fed08f..d12e4cbfc852 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -2590,9 +2590,10 @@
>   			power-domains = <&dispcc MDSS_GDSC>;
>   
>   			clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
> +				 <&gcc GCC_DISP_HF_AXI_CLK>,
>   				 <&gcc GCC_DISP_SF_AXI_CLK>,
>   				 <&dispcc DISP_CC_MDSS_MDP_CLK>;
> -			clock-names = "iface", "nrt_bus", "core";
> +			clock-names = "iface", "bus", "nrt_bus", "core";
>   
>   			assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
>   			assigned-clock-rates = <460000000>;


Is this the correct fix for the issue?  I see those same messages on the 
Lenovo Yoga C630 every so often as well as the blue screen, however I 
see them on both 5.14 (which does not have the related commit to this), 
and in 5.15-rcX, which does.  Or does this just revert it enough that it 
doesn't occur as often?

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Steev Klimaszewski]

On 10/14/21 10:42 AM, Steev Klimaszewski wrote:
>
> On 10/14/21 8:54 AM, Dmitry Baryshkov wrote:
>> From: Amit Pundir <amit.pundir@linaro.org>
>>
>> This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
>>
>> This upstream commit broke AOSP (post Android 12 merge) build
>> on RB5. The device either silently crashes into USB crash mode
>> after android boot animation or we see a blank blue screen
>> with following dpu errors in dmesg:
>>
>> [  T444] hw recovery is not complete for ctl:3
>> [  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu 
>> error]enc31 intf1 ctl 3 reset failure: -22
>> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu 
>> error]vblank timeout
>> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for 
>> commit done returned -110
>> [    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 
>> frame done timeout
>> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu 
>> error]vblank timeout
>> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for 
>> commit done returned -110
>>
>> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
>> ---
>>   arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi 
>> b/arch/arm64/boot/dts/qcom/sm8250.dtsi
>> index 8c15d9fed08f..d12e4cbfc852 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
>> @@ -2590,9 +2590,10 @@
>>               power-domains = <&dispcc MDSS_GDSC>;
>>                 clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
>> +                 <&gcc GCC_DISP_HF_AXI_CLK>,
>>                    <&gcc GCC_DISP_SF_AXI_CLK>,
>>                    <&dispcc DISP_CC_MDSS_MDP_CLK>;
>> -            clock-names = "iface", "nrt_bus", "core";
>> +            clock-names = "iface", "bus", "nrt_bus", "core";
>>                 assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
>>               assigned-clock-rates = <460000000>;
>
>
> Is this the correct fix for the issue?  I see those same messages on 
> the Lenovo Yoga C630 every so often as well as the blue screen, 
> however I see them on both 5.14 (which does not have the related 
> commit to this), and in 5.15-rcX, which does.  Or does this just 
> revert it enough that it doesn't occur as often?
>
Apologies, I hit send too soon.  To test here, I reverted 
111c52854102983f which is the related sdm845 commit, and the first 
reboot to test reverting it, I ended up with the bluescreen and the 
messages mentioned in the commit message above.

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Vladimir Zapolskiy]

Hi Dmitry,

On 10/14/21 4:54 PM, Dmitry Baryshkov wrote:
> From: Amit Pundir <amit.pundir@linaro.org>
> 
> This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
> 
> This upstream commit broke AOSP (post Android 12 merge) build
> on RB5. The device either silently crashes into USB crash mode
> after android boot animation or we see a blank blue screen
> with following dpu errors in dmesg:
> 
> [  T444] hw recovery is not complete for ctl:3
> [  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22
> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> [    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout
> [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> 
> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

your sob tag is missing.

> ---
>   arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index 8c15d9fed08f..d12e4cbfc852 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -2590,9 +2590,10 @@
>   			power-domains = <&dispcc MDSS_GDSC>;
>   
>   			clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
> +				 <&gcc GCC_DISP_HF_AXI_CLK>,
>   				 <&gcc GCC_DISP_SF_AXI_CLK>,
>   				 <&dispcc DISP_CC_MDSS_MDP_CLK>;
> -			clock-names = "iface", "nrt_bus", "core";
> +			clock-names = "iface", "bus", "nrt_bus", "core";
>   
>   			assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
>   			assigned-clock-rates = <460000000>;
> 

--
Best wishes,
Vladimir

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Dmitry Baryshkov]

On Thu, 14 Oct 2021 at 19:54, Vladimir Zapolskiy
<vladimir.zapolskiy@linaro.org> wrote:
>
> Hi Dmitry,
>
> On 10/14/21 4:54 PM, Dmitry Baryshkov wrote:
> > From: Amit Pundir <amit.pundir@linaro.org>
> >
> > This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
> >
> > This upstream commit broke AOSP (post Android 12 merge) build
> > on RB5. The device either silently crashes into USB crash mode
> > after android boot animation or we see a blank blue screen
> > with following dpu errors in dmesg:
> >
> > [  T444] hw recovery is not complete for ctl:3
> > [  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22
> > [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> > [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> > [    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout
> > [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> > [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> >
> > Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
>
> your sob tag is missing.

True. I hope this is fine:

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

>
> > ---
> >   arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > index 8c15d9fed08f..d12e4cbfc852 100644
> > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > @@ -2590,9 +2590,10 @@
> >                       power-domains = <&dispcc MDSS_GDSC>;
> >
> >                       clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
> > +                              <&gcc GCC_DISP_HF_AXI_CLK>,
> >                                <&gcc GCC_DISP_SF_AXI_CLK>,
> >                                <&dispcc DISP_CC_MDSS_MDP_CLK>;
> > -                     clock-names = "iface", "nrt_bus", "core";
> > +                     clock-names = "iface", "bus", "nrt_bus", "core";
> >
> >                       assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
> >                       assigned-clock-rates = <460000000>;
> >
>
> --
> Best wishes,
> Vladimir



-- 
With best wishes
Dmitry

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[Amit Pundir]

On Fri, 15 Oct 2021 at 02:53, Dmitry Baryshkov
<dmitry.baryshkov@linaro.org> wrote:
>
> On Thu, 14 Oct 2021 at 19:54, Vladimir Zapolskiy
> <vladimir.zapolskiy@linaro.org> wrote:
> >
> > Hi Dmitry,
> >
> > On 10/14/21 4:54 PM, Dmitry Baryshkov wrote:
> > > From: Amit Pundir <amit.pundir@linaro.org>
> > >
> > > This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
> > >
> > > This upstream commit broke AOSP (post Android 12 merge) build
> > > on RB5. The device either silently crashes into USB crash mode
> > > after android boot animation or we see a blank blue screen
> > > with following dpu errors in dmesg:
> > >
> > > [  T444] hw recovery is not complete for ctl:3
> > > [  T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22
> > > [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> > > [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> > > [    C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout
> > > [  T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout
> > > [  T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110
> > >
> > > Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> >
> > your sob tag is missing.
>
> True. I hope this is fine:
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>

Hi,

Any update on this? I'd really like to see this or a relevant fix to
land in v5.15, because I can't boot AOSP on RB5 otherwise.

Regards,
Amit Pundir

> >
> > > ---
> > >   arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > > index 8c15d9fed08f..d12e4cbfc852 100644
> > > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> > > @@ -2590,9 +2590,10 @@
> > >                       power-domains = <&dispcc MDSS_GDSC>;
> > >
> > >                       clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
> > > +                              <&gcc GCC_DISP_HF_AXI_CLK>,
> > >                                <&gcc GCC_DISP_SF_AXI_CLK>,
> > >                                <&dispcc DISP_CC_MDSS_MDP_CLK>;
> > > -                     clock-names = "iface", "nrt_bus", "core";
> > > +                     clock-names = "iface", "bus", "nrt_bus", "core";
> > >
> > >                       assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
> > >                       assigned-clock-rates = <460000000>;
> > >
> >
> > --
> > Best wishes,
> > Vladimir
>
>
>
> --
> With best wishes
> Dmitry

Re: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"

[patchwork-bot+linux-arm-msm]

Hello:

This patch was applied to qcom/linux.git (for-next)
by Bjorn Andersson <bjorn.andersson@linaro.org>:

On Thu, 14 Oct 2021 16:54:10 +0300 you wrote:
> From: Amit Pundir <amit.pundir@linaro.org>
> 
> This reverts commit 001ce9785c0674d913531345e86222c965fc8bf4.
> 
> This upstream commit broke AOSP (post Android 12 merge) build
> on RB5. The device either silently crashes into USB crash mode
> after android boot animation or we see a blank blue screen
> with following dpu errors in dmesg:
> 
> [...]

Here is the summary with links:
  - Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"
    https://git.kernel.org/qcom/c/e091b836a3ba

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html