diff mbox

[RESEND] drm/hisilicon: Ensure LDI regs are properly configured.

Message ID 1502806465-17772-1-git-send-email-peter.griffin@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Griffin Aug. 15, 2017, 2:14 p.m. UTC 
This patch fixes the following soft lockup:
  BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]

On weston idle-timeout the IP is powered down and reset
asserted. On weston resume we get a massive vblank
IRQ storm due to the LDI registers having lost some state.

This state loss is caused by ade_crtc_atomic_begin() not
calling ade_ldi_set_mode(). With this patch applied
resuming from Weston idle-timeout works well.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Xinliang Liu Aug. 28, 2017, 8:44 a.m. UTC | #1 
Hi,

On 15 August 2017 at 22:14, Peter Griffin <peter.griffin@linaro.org> wrote:

> This patch fixes the following soft lockup:
>   BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]
>
> On weston idle-timeout the IP is powered down and reset
> asserted. On weston resume we get a massive vblank
> IRQ storm due to the LDI registers having lost some state.
>
> This state loss is caused by ade_crtc_atomic_begin() not
> calling ade_ldi_set_mode(). With this patch applied
> resuming from Weston idle-timeout works well.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Tested-by: John Stultz <john.stultz@linaro.org>
>

​​Thanks Peter,
This patch looks good to me.
Reviewed-by: Xinliang Liu <xinliang.liu@linaro.org>​

@Sean, could you please help to apply to drm-misc if others has no more
comments, thanks.

Thanks,
Xinliang
​

> Cc: stable@vger.kernel.org
> ---
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> index c96c228..72c6357 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> @@ -519,9 +519,12 @@ static void ade_crtc_atomic_begin(struct drm_crtc
> *crtc,
>  {
>         struct ade_crtc *acrtc = to_ade_crtc(crtc);
>         struct ade_hw_ctx *ctx = acrtc->ctx;
> +       struct drm_display_mode *mode = &crtc->state->mode;
> +       struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode;
>
>         if (!ctx->power_on)
>                 (void)ade_power_up(ctx);
> +       ade_ldi_set_mode(acrtc, mode, adj_mode);
>  }
>
>  static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Daniel Vetter Aug. 28, 2017, 8:51 a.m. UTC | #2 
On Mon, Aug 28, 2017 at 04:44:30PM +0800, Xinliang Liu wrote:
> Hi,
> 
> On 15 August 2017 at 22:14, Peter Griffin <peter.griffin@linaro.org> wrote:
> 
> > This patch fixes the following soft lockup:
> >   BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]
> >
> > On weston idle-timeout the IP is powered down and reset
> > asserted. On weston resume we get a massive vblank
> > IRQ storm due to the LDI registers having lost some state.
> >
> > This state loss is caused by ade_crtc_atomic_begin() not
> > calling ade_ldi_set_mode(). With this patch applied
> > resuming from Weston idle-timeout works well.
> >
> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> > Tested-by: John Stultz <john.stultz@linaro.org>
> >
> 
> ​​Thanks Peter,
> This patch looks good to me.
> Reviewed-by: Xinliang Liu <xinliang.liu@linaro.org>​
> 
> @Sean, could you please help to apply to drm-misc if others has no more
> comments, thanks.

hisilicon isn't maintained in drm-misc, and you're the maintainer. This is
not how it works. So either
a) pick up the patch and send out a pull request to Dave Airlie
b) move hisilicon over to drm-misc and become a drm-misc maintainer
yourself. This needs a MAINTAINERS update to point the git tree at
drm-misc.

drm-misc maintainers don't maintain everyone else's driver as a service,
that simply doesn't scale.

Thanks, Daniel

> 
> Thanks,
> Xinliang
> ​
> 
> > Cc: stable@vger.kernel.org
> > ---
> >  drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > index c96c228..72c6357 100644
> > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > @@ -519,9 +519,12 @@ static void ade_crtc_atomic_begin(struct drm_crtc
> > *crtc,
> >  {
> >         struct ade_crtc *acrtc = to_ade_crtc(crtc);
> >         struct ade_hw_ctx *ctx = acrtc->ctx;
> > +       struct drm_display_mode *mode = &crtc->state->mode;
> > +       struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode;
> >
> >         if (!ctx->power_on)
> >                 (void)ade_power_up(ctx);
> > +       ade_ldi_set_mode(acrtc, mode, adj_mode);
> >  }
> >
> >  static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
> > --
> > 2.7.4
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >

> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Xinliang Liu Aug. 28, 2017, 9:27 a.m. UTC | #3 
Hi Daniel,

On 28 August 2017 at 16:51, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, Aug 28, 2017 at 04:44:30PM +0800, Xinliang Liu wrote:
>> Hi,
>>
>> On 15 August 2017 at 22:14, Peter Griffin <peter.griffin@linaro.org> wrote:
>>
>> > This patch fixes the following soft lockup:
>> >   BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]
>> >
>> > On weston idle-timeout the IP is powered down and reset
>> > asserted. On weston resume we get a massive vblank
>> > IRQ storm due to the LDI registers having lost some state.
>> >
>> > This state loss is caused by ade_crtc_atomic_begin() not
>> > calling ade_ldi_set_mode(). With this patch applied
>> > resuming from Weston idle-timeout works well.
>> >
>> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
>> > Tested-by: John Stultz <john.stultz@linaro.org>
>> >
>>
>> Thanks Peter,
>> This patch looks good to me.
>> Reviewed-by: Xinliang Liu <xinliang.liu@linaro.org>
>>
>> @Sean, could you please help to apply to drm-misc if others has no more
>> comments, thanks.
>
> hisilicon isn't maintained in drm-misc, and you're the maintainer. This is
> not how it works. So either
> a) pick up the patch and send out a pull request to Dave Airlie
> b) move hisilicon over to drm-misc and become a drm-misc maintainer
> yourself. This needs a MAINTAINERS update to point the git tree at
> drm-misc.
>
> drm-misc maintainers don't maintain everyone else's driver as a service,
> that simply doesn't scale.

Sorry for my misunderstanding and thanks for pointing out that how
drm-misc works.
So I will pick up the patch and send a pull request.

Thanks,
Xinliang

>
> Thanks, Daniel
>
>>
>> Thanks,
>> Xinliang
>>
>>
>> > Cc: stable@vger.kernel.org
>> > ---
>> >  drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +++
>> >  1 file changed, 3 insertions(+)
>> >
>> > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
>> > b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
>> > index c96c228..72c6357 100644
>> > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
>> > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
>> > @@ -519,9 +519,12 @@ static void ade_crtc_atomic_begin(struct drm_crtc
>> > *crtc,
>> >  {
>> >         struct ade_crtc *acrtc = to_ade_crtc(crtc);
>> >         struct ade_hw_ctx *ctx = acrtc->ctx;
>> > +       struct drm_display_mode *mode = &crtc->state->mode;
>> > +       struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode;
>> >
>> >         if (!ctx->power_on)
>> >                 (void)ade_power_up(ctx);
>> > +       ade_ldi_set_mode(acrtc, mode, adj_mode);
>> >  }
>> >
>> >  static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
>> > --
>> > 2.7.4
>> >
>> > _______________________________________________
>> > dri-devel mailing list
>> > dri-devel@lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>> >
>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
Peter Griffin Oct. 23, 2017, 5:34 p.m. UTC | #4 
Hi Xinliang,

On 28 August 2017 at 10:27, Xinliang Liu <xinliang.liu@linaro.org> wrote:

> Hi Daniel,
>
> On 28 August 2017 at 16:51, Daniel Vetter <daniel@ffwll.ch> wrote:
> > On Mon, Aug 28, 2017 at 04:44:30PM +0800, Xinliang Liu wrote:
> >> Hi,
> >>
> >> On 15 August 2017 at 22:14, Peter Griffin <peter.griffin@linaro.org>
> wrote:
> >>
> >> > This patch fixes the following soft lockup:
> >> >   BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]
> >> >
> >> > On weston idle-timeout the IP is powered down and reset
> >> > asserted. On weston resume we get a massive vblank
> >> > IRQ storm due to the LDI registers having lost some state.
> >> >
> >> > This state loss is caused by ade_crtc_atomic_begin() not
> >> > calling ade_ldi_set_mode(). With this patch applied
> >> > resuming from Weston idle-timeout works well.
> >> >
> >> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> >> > Tested-by: John Stultz <john.stultz@linaro.org>
> >> >
> >>
> >> Thanks Peter,
> >> This patch looks good to me.
> >> Reviewed-by: Xinliang Liu <xinliang.liu@linaro.org>
> >>
> >> @Sean, could you please help to apply to drm-misc if others has no more
> >> comments, thanks.
> >
> > hisilicon isn't maintained in drm-misc, and you're the maintainer. This
> is
> > not how it works. So either
> > a) pick up the patch and send out a pull request to Dave Airlie
> > b) move hisilicon over to drm-misc and become a drm-misc maintainer
> > yourself. This needs a MAINTAINERS update to point the git tree at
> > drm-misc.
> >
> > drm-misc maintainers don't maintain everyone else's driver as a service,
> > that simply doesn't scale.
>
> Sorry for my misunderstanding and thanks for pointing out that how
> drm-misc works.
> So I will pick up the patch and send a pull request.
>

Did you send the pull request?

I still can't see this patch in the latest kernel RC.

Peter.
xinliang Oct. 25, 2017, 1 a.m. UTC | #5 
Hi Peter,


On 2017/10/24 1:34, Peter Griffin wrote:
> Hi Xinliang,
>
> On 28 August 2017 at 10:27, Xinliang Liu <xinliang.liu@linaro.org 
> <mailto:xinliang.liu@linaro.org>> wrote:
>
>     Hi Daniel,
>
>     On 28 August 2017 at 16:51, Daniel Vetter <daniel@ffwll.ch
>     <mailto:daniel@ffwll.ch>> wrote:
>     > On Mon, Aug 28, 2017 at 04:44:30PM +0800, Xinliang Liu wrote:
>     >> Hi,
>     >>
>     >> On 15 August 2017 at 22:14, Peter Griffin
>     <peter.griffin@linaro.org <mailto:peter.griffin@linaro.org>> wrote:
>     >>
>     >> > This patch fixes the following soft lockup:
>     >> >   BUG: soft lockup - CPU#0 stuck for 23s! [weston:307]
>     >> >
>     >> > On weston idle-timeout the IP is powered down and reset
>     >> > asserted. On weston resume we get a massive vblank
>     >> > IRQ storm due to the LDI registers having lost some state.
>     >> >
>     >> > This state loss is caused by ade_crtc_atomic_begin() not
>     >> > calling ade_ldi_set_mode(). With this patch applied
>     >> > resuming from Weston idle-timeout works well.
>     >> >
>     >> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org
>     <mailto:peter.griffin@linaro.org>>
>     >> > Tested-by: John Stultz <john.stultz@linaro.org
>     <mailto:john.stultz@linaro.org>>
>     >> >
>     >>
>     >> Thanks Peter,
>     >> This patch looks good to me.
>     >> Reviewed-by: Xinliang Liu <xinliang.liu@linaro.org
>     <mailto:xinliang.liu@linaro.org>>
>     >>
>     >> @Sean, could you please help to apply to drm-misc if others has
>     no more
>     >> comments, thanks.
>     >
>     > hisilicon isn't maintained in drm-misc, and you're the
>     maintainer. This is
>     > not how it works. So either
>     > a) pick up the patch and send out a pull request to Dave Airlie
>     > b) move hisilicon over to drm-misc and become a drm-misc maintainer
>     > yourself. This needs a MAINTAINERS update to point the git tree at
>     > drm-misc.
>     >
>     > drm-misc maintainers don't maintain everyone else's driver as a
>     service,
>     > that simply doesn't scale.
>
>     Sorry for my misunderstanding and thanks for pointing out that how
>     drm-misc works.
>     So I will pick up the patch and send a pull request.
>
>
> Did you send the pull request?
>
> I still can't see this patch in the latest kernel RC.
I have sent in last cycle, it seems it didn't catch last cycle. Maybe I 
need to resend again this cycle.
Will send soon.

Thanks,
Xinliang
>
> Peter.
diff mbox

Patch

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index c96c228..72c6357 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -519,9 +519,12 @@  static void ade_crtc_atomic_begin(struct drm_crtc *crtc,
 {
 	struct ade_crtc *acrtc = to_ade_crtc(crtc);
 	struct ade_hw_ctx *ctx = acrtc->ctx;
+	struct drm_display_mode *mode = &crtc->state->mode;
+	struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode;
 
 	if (!ctx->power_on)
 		(void)ade_power_up(ctx);
+	ade_ldi_set_mode(acrtc, mode, adj_mode);
 }
 
 static void ade_crtc_atomic_flush(struct drm_crtc *crtc,