Unverified Commit a4d89568 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: crtc: Remove mode_set_nofb 



On BCM2711 to avoid stale pixels getting stuck in intermediate FIFOs, the
pixelvalve needs to be setup each time there's a mode change or enable /
disable sequence.

Therefore, we can't really use mode_set_nofb anymore to configure it, but
we need to move it to atomic_enable.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarHoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f86c7a6946f98262f1cf59a461596a796d4bcc5f.1599120059.git-series.maxime@cerno.tech
parent f8b13d9b

drivers/gpu/drm/vc4/vc4_crtc.c

+1 −6
Original line number Diff line number Diff line
@@ -376,11 +376,6 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) 
	}

}



static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)

{

	vc4_crtc_config_pv(crtc);

}



static void require_hvs_enabled(struct drm_device *dev)

{

	struct vc4_dev *vc4 = to_vc4_dev(dev);
@@ -433,6 +428,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, 
	require_hvs_enabled(dev);



	vc4_crtc_pixelvalve_reset(crtc);

	vc4_crtc_config_pv(crtc);



	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
@@ -791,7 +787,6 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { 
};



static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {

	.mode_set_nofb = vc4_crtc_mode_set_nofb,

	.mode_valid = vc4_crtc_mode_valid,

	.atomic_check = vc4_crtc_atomic_check,

	.atomic_flush = vc4_hvs_atomic_flush,