mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			44 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 1d4f8c2573da23a2552342809135deb80b7af1d6 Mon Sep 17 00:00:00 2001
 | 
						|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 | 
						|
Date: Thu, 11 Aug 2022 13:59:34 +0100
 | 
						|
Subject: [PATCH 055/726] drm/vc4: 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.
 | 
						|
 | 
						|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 | 
						|
---
 | 
						|
 drivers/gpu/drm/vc4/vc4_hvs.c | 11 +++++++++++
 | 
						|
 1 file changed, 11 insertions(+)
 | 
						|
 | 
						|
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
 | 
						|
index 23f8da10ea53..97388f9a75bc 100644
 | 
						|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
 | 
						|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
 | 
						|
@@ -1138,6 +1138,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.
 | 
						|
-- 
 | 
						|
2.33.1
 | 
						|
 |