27c9d80f51
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 45a50f21f4e58aba0a9cfe9314c03cef3fad720c Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 26 May 2022 18:56:19 +0100
|
|
Subject: [PATCH 1063/1085] drm: vc4: Reset DSI AFE on disable
|
|
|
|
vc4_dsi_bridge_disable wasn't resetting things during shutdown,
|
|
so add that in.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
@@ -358,6 +358,16 @@
|
|
# define DSI_PHY_AFEC0_CTATADJ_MASK VC4_MASK(3, 0)
|
|
# define DSI_PHY_AFEC0_CTATADJ_SHIFT 0
|
|
|
|
+# define DSI0_AFEC0_PD_ALL_LANES (DSI0_PHY_AFEC0_PD | \
|
|
+ DSI0_PHY_AFEC0_PD_BG | \
|
|
+ DSI0_PHY_AFEC0_PD_DLANE1)
|
|
+
|
|
+# define DSI1_AFEC0_PD_ALL_LANES (DSI1_PHY_AFEC0_PD | \
|
|
+ DSI1_PHY_AFEC0_PD_BG | \
|
|
+ DSI1_PHY_AFEC0_PD_DLANE3 | \
|
|
+ DSI1_PHY_AFEC0_PD_DLANE2 | \
|
|
+ DSI1_PHY_AFEC0_PD_DLANE1)
|
|
+
|
|
#define DSI0_PHY_AFEC1 0x68
|
|
# define DSI0_PHY_AFEC1_IDR_DLANE1_MASK VC4_MASK(10, 8)
|
|
# define DSI0_PHY_AFEC1_IDR_DLANE1_SHIFT 8
|
|
@@ -807,6 +817,16 @@ static void vc4_dsi_bridge_disable(struc
|
|
disp0_ctrl = DSI_PORT_READ(DISP0_CTRL);
|
|
disp0_ctrl &= ~DSI_DISP0_ENABLE;
|
|
DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl);
|
|
+
|
|
+ /* Reset the DSI and all its fifos. */
|
|
+ DSI_PORT_WRITE(CTRL, DSI_CTRL_SOFT_RESET_CFG |
|
|
+ DSI_PORT_BIT(CTRL_RESET_FIFOS));
|
|
+
|
|
+ /* Power down the analogue front end. */
|
|
+ DSI_PORT_WRITE(PHY_AFEC0, DSI_PORT_BIT(PHY_AFEC0_RESET) |
|
|
+ DSI_PORT_BIT(PHY_AFEC0_PD) |
|
|
+ DSI_PORT_BIT(AFEC0_PD_ALL_LANES));
|
|
+
|
|
}
|
|
|
|
static void vc4_dsi_bridge_post_disable(struct drm_bridge *bridge,
|