All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
@ 2017-08-15 14:14 ` Peter Griffin
  0 siblings, 0 replies; 19+ messages in thread
From: Peter Griffin @ 2017-08-15 14:14 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, z.liuxinliang, zourongrong,
	kong.kongxinwei, puck.chen, airlied
  Cc: john.stultz, dri-devel, andrey.konovalov, guodong.xu, shawn.guo,
	Peter Griffin, stable

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(+)

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] 19+ messages in thread
* [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
@ 2017-06-29 20:54 ` Peter Griffin
  0 siblings, 0 replies; 19+ messages in thread
From: Peter Griffin @ 2017-06-29 20:54 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel, z.liuxinliang, zourongrong,
	kong.kongxinwei, puck.chen, airlied
  Cc: stable, john.stultz, dri-devel, andrey.konovalov, fathi.boudra,
	Peter Griffin

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] 19+ messages in thread

end of thread, other threads:[~2017-10-25  1:08 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-15 14:14 [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured Peter Griffin
2017-08-15 14:14 ` Peter Griffin
2017-08-28  8:44 ` Xinliang Liu
2017-08-28  8:51   ` Daniel Vetter
2017-08-28  8:51     ` Daniel Vetter
2017-08-28  8:51     ` Daniel Vetter
2017-08-28  9:27     ` Xinliang Liu
2017-08-28  9:27       ` Xinliang Liu
2017-10-23 17:34       ` Peter Griffin
2017-10-25  1:00         ` liuxinliang
  -- strict thread matches above, loose matches on Subject: below --
2017-06-29 20:54 Peter Griffin
2017-06-29 20:54 ` Peter Griffin
2017-06-29 21:10 ` John Stultz
2017-06-29 21:10   ` John Stultz
2017-06-29 21:10   ` John Stultz
2017-06-29 21:10   ` John Stultz
2017-06-30  5:55 ` Greg KH
2017-06-30  5:55   ` Greg KH
2017-06-30  5:55   ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.