2024-05-10 11:19:19 +00:00
|
|
|
From 973defdd4e1fc0db35031c7cc06803afd1cf11df Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
Date: Thu, 22 Jun 2023 14:06:40 +0100
|
|
|
|
|
Subject: [PATCH 0601/1085] drm/vc4: hvs: Remove ABORT_ON_EMPTY flag
|
|
|
|
|
|
|
|
|
|
ABORT_ON_EMPTY chooses whether the HVS abandons the current frame
|
|
|
|
|
when it experiences an underflow, or attempts to continue.
|
|
|
|
|
|
|
|
|
|
In theory the frame should be black from the point of underflow,
|
|
|
|
|
compared to a shift of sebsequent pixels to the left.
|
|
|
|
|
|
|
|
|
|
Unfortunately it seems to put the HVS is a bad state where it is not
|
|
|
|
|
possible to recover simply. This typically requires a reboot
|
|
|
|
|
following the 'flip done timed out message'.
|
|
|
|
|
|
|
|
|
|
Discussion with Broadcom has suggested we don't use this flag.
|
|
|
|
|
All their testing is done with it disabled.
|
|
|
|
|
|
|
|
|
|
Additionally setting BLANK_INSERT_EN causes the HDMI to output
|
|
|
|
|
blank pixels on an underflow which avoids it losing sync.
|
|
|
|
|
|
|
|
|
|
After this change a 'flip done timed out' due to sdram bandwidth
|
|
|
|
|
starvation or too low a clock is recoverable once the situation improves.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_regs.h | 1 +
|
|
|
|
|
2 files changed, 2 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
2024-10-04 19:39:07 +00:00
|
|
|
@@ -1868,6 +1868,7 @@ static void vc4_hdmi_encoder_post_crtc_e
|
2024-05-10 11:19:19 +00:00
|
|
|
VC4_HD_VID_CTL_CLRRGB |
|
|
|
|
|
VC4_HD_VID_CTL_UNDERFLOW_ENABLE |
|
|
|
|
|
VC4_HD_VID_CTL_FRAME_COUNTER_RESET |
|
|
|
|
|
+ VC4_HD_VID_CTL_BLANK_INSERT_EN |
|
|
|
|
|
(vsync_pos ? 0 : VC4_HD_VID_CTL_VSYNC_LOW) |
|
|
|
|
|
(hsync_pos ? 0 : VC4_HD_VID_CTL_HSYNC_LOW));
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_regs.h
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_regs.h
|
|
|
|
|
@@ -799,6 +799,7 @@ enum {
|
|
|
|
|
# define VC4_HD_VID_CTL_CLRSYNC BIT(24)
|
|
|
|
|
# define VC4_HD_VID_CTL_CLRRGB BIT(23)
|
|
|
|
|
# define VC4_HD_VID_CTL_BLANKPIX BIT(18)
|
|
|
|
|
+# define VC4_HD_VID_CTL_BLANK_INSERT_EN BIT(16)
|
|
|
|
|
|
|
|
|
|
# define VC4_HD_CSC_CTL_ORDER_MASK VC4_MASK(7, 5)
|
|
|
|
|
# define VC4_HD_CSC_CTL_ORDER_SHIFT 5
|
