Commit 014eccc9 authored by Dave Stevenson's avatar Dave Stevenson
Browse files

drm/vc4: hvs: Set AXI panic modes for the HVS 



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: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240621152055.4180873-7-dave.stevenson@raspberrypi.com


Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
parent 31c8a80b

drivers/gpu/drm/vc4/vc4_hvs.c

+11 −0
Original line number Diff line number Diff line
@@ -951,6 +951,17 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) 
			      SCALER_DISPCTRL_SCLEIRQ);





	/* Set AXI panic mode.

	 * VC4 panics when < 2 lines in FIFO.

	 * VC5 panics when less than 1 line in the FIFO.

	 */

	dispctrl &= ~(SCALER_DISPCTRL_PANIC0_MASK |

		      SCALER_DISPCTRL_PANIC1_MASK |

		      SCALER_DISPCTRL_PANIC2_MASK);

	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC0);

	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1);

	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2);



	/* Set AXI panic mode.

	 * VC4 panics when < 2 lines in FIFO.

	 * VC5 panics when less than 1 line in the FIFO.