Skip to content

Commit 93c57c6

Browse files
committed
vc4/drm: Remove the clear of SCALER_DISPBKGND_FILL
Since "drm/vc4: hvs: Support BCM2712 HVS" booting Pi4 with dual 4kp30 displays connected fails with: vc4-drm gpu: [drm] *ERROR* [CRTC:107:pixelvalve-4] flip_done timed out It has been tracked down to the referenced commit adding a path to clear the SCALER_DISPBKGND_FILL when not required. While that appears valid, it causes a problem (that still needs to be understood). Lets revert that change to avoid the regression for now. Fixes: e84da23 ("drm/vc4: hvs: Support BCM2712 HVS") Signed-off-by: Dom Cobley <[email protected]>
1 parent 7ec4274 commit 93c57c6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,10 +1366,6 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
13661366
HVS_WRITE(SCALER6_DISPX_CTRL1(channel),
13671367
HVS_READ(SCALER6_DISPX_CTRL1(channel)) &
13681368
~SCALER6_DISPX_CTRL1_BGENB);
1369-
else
1370-
HVS_WRITE(SCALER_DISPBKGNDX(channel),
1371-
HVS_READ(SCALER_DISPBKGNDX(channel)) &
1372-
~SCALER_DISPBKGND_FILL);
13731369
}
13741370

13751371
/* Only update DISPLIST if the CRTC was already running and is not

0 commit comments

Comments
 (0)