Skip to content

Commit a06ef71

Browse files
6by9gregkh
authored andcommitted
drm/vc4: hvs: Set AXI panic modes for the HVS
[ Upstream commit 014eccc ] The HVS can change AXI request mode based on how full the COB FIFOs are. Until now the vc4 driver has been relying on the firmware to have set these to sensible values. With HVS channel 2 now being used for live video, change the panic mode for all channels to be explicitly set by the driver, and the same for all channels. Reviewed-by: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dave Stevenson <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 7315275 commit a06ef71

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,17 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
963963
SCALER_DISPCTRL_SCLEIRQ);
964964

965965

966+
/* Set AXI panic mode.
967+
* VC4 panics when < 2 lines in FIFO.
968+
* VC5 panics when less than 1 line in the FIFO.
969+
*/
970+
dispctrl &= ~(SCALER_DISPCTRL_PANIC0_MASK |
971+
SCALER_DISPCTRL_PANIC1_MASK |
972+
SCALER_DISPCTRL_PANIC2_MASK);
973+
dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC0);
974+
dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1);
975+
dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2);
976+
966977
/* Set AXI panic mode.
967978
* VC4 panics when < 2 lines in FIFO.
968979
* VC5 panics when less than 1 line in the FIFO.

0 commit comments

Comments
 (0)