* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
@ 2017-06-29 20:54 Peter Griffin
2017-06-29 21:10 ` John Stultz
2017-06-30 5:55 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Peter Griffin @ 2017-06-29 20:54 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
2017-06-29 20:54 [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured Peter Griffin
@ 2017-06-29 21:10 ` John Stultz
2017-06-30 5:55 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: John Stultz @ 2017-06-29 21:10 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 29, 2017 at 1:54 PM, 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>
While the issue hasn't seemingly come up with Android, I've been
running with this patch in my tree for a while without issue. So..
Tested-by: John Stultz <john.stultz@linaro.org>
thanks
-john
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
2017-06-29 20:54 [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured Peter Griffin
2017-06-29 21:10 ` John Stultz
@ 2017-06-30 5:55 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2017-06-30 5:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 29, 2017 at 09:54:38PM +0100, Peter Griffin 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>
> ---
> drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +++
> 1 file changed, 3 insertions(+)
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
2017-08-28 8:51 ` Daniel Vetter
@ 2017-08-28 9:27 ` Xinliang Liu
0 siblings, 0 replies; 6+ messages in thread
From: Xinliang Liu @ 2017-08-28 9:27 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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 at lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>> >
>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
[not found] ` <CAGd==07ygp97ggXSAK5JCYweRZPFwjqa2WNV3g1fdyY6736pPw@mail.gmail.com>
@ 2017-08-28 8:51 ` Daniel Vetter
2017-08-28 9:27 ` Xinliang Liu
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2017-08-28 8:51 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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 at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
@ 2017-08-15 14:14 Peter Griffin
[not found] ` <CAGd==07ygp97ggXSAK5JCYweRZPFwjqa2WNV3g1fdyY6736pPw@mail.gmail.com>
0 siblings, 1 reply; 6+ messages in thread
From: Peter Griffin @ 2017-08-15 14:14 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-28 9:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-29 20:54 [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured Peter Griffin
2017-06-29 21:10 ` John Stultz
2017-06-30 5:55 ` Greg KH
2017-08-15 14:14 Peter Griffin
[not found] ` <CAGd==07ygp97ggXSAK5JCYweRZPFwjqa2WNV3g1fdyY6736pPw@mail.gmail.com>
2017-08-28 8:51 ` Daniel Vetter
2017-08-28 9:27 ` Xinliang Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).