[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1502806465-17772-1-git-send-email-peter.griffin@linaro.org>
Date: Tue, 15 Aug 2017 15:14:25 +0100
From: Peter Griffin <peter.griffin@...aro.org>
To: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
z.liuxinliang@...ilicon.com, zourongrong@...il.com,
kong.kongxinwei@...ilicon.com, puck.chen@...ilicon.com,
airlied@...ux.ie
Cc: john.stultz@...aro.org, dri-devel@...ts.freedesktop.org,
andrey.konovalov@...aro.org, guodong.xu@...aro.org,
shawn.guo@...aro.org, Peter Griffin <peter.griffin@...aro.org>,
stable@...r.kernel.org
Subject: [RESEND PATCH] drm/hisilicon: Ensure LDI regs are properly configured.
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@...aro.org>
Tested-by: John Stultz <john.stultz@...aro.org>
Cc: stable@...r.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
Powered by blists - more mailing lists