Commit f5e69000 authored by Peter Griffin's avatar Peter Griffin Committed by Greg Kroah-Hartman

drm/hisilicon: Ensure LDI regs are properly configured.

commit a2f04243 upstream.

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: default avatarPeter Griffin <>
Tested-by: default avatarJohn Stultz <>
Reviewed-by: default avatarXinliang Liu <>
Signed-off-by: default avatarXinliang Liu <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 87139913
......@@ -534,9 +534,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)
ade_ldi_set_mode(acrtc, mode, adj_mode);
static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment