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

drm/vc4: crtc: Add encoder to vc4_crtc_config_pv prototype 



vc4_crtc_config_pv() retrieves the encoder again, even though its only
caller, vc4_crtc_atomic_enable(), already did.

Pass the encoder pointer as an argument instead of going through all the
connectors to retrieve it again.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20211025152903.1088803-5-maxime@cerno.tech
parent d0229c36

drivers/gpu/drm/vc4/vc4_crtc.c

+3 −4
Original line number Diff line number Diff line
@@ -315,12 +315,11 @@ static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc) 
	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_FIFO_CLR);

}



static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_atomic_state *state)

static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encoder,

			       struct drm_atomic_state *state)

{

	struct drm_device *dev = crtc->dev;

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,

							   drm_atomic_get_new_connector_state);

	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);

	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);

	const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
@@ -597,7 +596,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, 
	if (vc4_encoder->pre_crtc_configure)

		vc4_encoder->pre_crtc_configure(encoder, state);



	vc4_crtc_config_pv(crtc, state);

	vc4_crtc_config_pv(crtc, encoder, state);



	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);