From: Maxime Ripard <maxime@cerno.tech>

Date: Fri, 7 May 2021 17:05:08 +0200

Subject: drm/vc4: crtc: Lookup the encoder from the register at boot

Git-commit: b601c16b7ba8f3bb7a7e773b238da6b63657fa1d

Patch-mainline: v5.14-rc1

References: bsc#1198534

At boot, we can't rely on the vc4_get_crtc_encoder since we don't have a

state yet and thus will not be able to figure out which connector is

attached to our CRTC.

However, we have a muxing bit in the CRTC register we can use to get the

encoder currently connected to the pixelvalve. We can thus read that

register, lookup the associated register through the vc4_pv_data

structure, and then pass it to vc4_crtc_disable so that we can perform

the proper operations.

Fixes: 875a4d536842 ("drm/vc4: drv: Disable the CRTC at boot time")

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20210507150515.257424-6-maxime@cerno.tech

[iivanov: adapted on top of SLE15-SP3]

Acked-by: Ivan T. Ivanov <iivanov@suse.de>

---

 drivers/gpu/drm/vc4/vc4_crtc.c |   39 +++++++++++++++++++++++++++++++++++----

 1 file changed, 35 insertions(+), 4 deletions(-)

--- a/drivers/gpu/drm/vc4/vc4_crtc.c

+++ b/drivers/gpu/drm/vc4/vc4_crtc.c

@@ -420,9 +420,10 @@ static void require_hvs_enabled(struct d

 		     SCALER_DISPCTRL_ENABLE);

 }

-static int vc4_crtc_disable(struct drm_crtc *crtc, unsigned int channel)

+static int vc4_crtc_disable(struct drm_crtc *crtc,

+			    struct drm_encoder *encoder,

+			    unsigned int channel)

 {

-	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc);

 	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);

 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);

 	struct drm_device *dev = crtc->dev;

@@ -463,10 +464,29 @@ static int vc4_crtc_disable(struct drm_c

 	return 0;

 }

+static struct drm_encoder *vc4_crtc_get_encoder_by_type(struct drm_crtc *crtc,

+							enum vc4_encoder_type type)

+{

+	struct drm_encoder *encoder;

+

+	drm_for_each_encoder(encoder, crtc->dev) {

+		struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);

+

+		if (vc4_encoder->type == type)

+			return encoder;

+	}

+

+	return NULL;

+}

+

 int vc4_crtc_disable_at_boot(struct drm_crtc *crtc)

 {

 	struct drm_device *drm = crtc->dev;

 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);

+	enum vc4_encoder_type encoder_type;

+	const struct vc4_pv_data *pv_data;

+	struct drm_encoder *encoder;

+	unsigned encoder_sel;

 	int channel;

 	if (!(of_device_is_compatible(vc4_crtc->pdev->dev.of_node,

@@ -485,13 +505,24 @@ int vc4_crtc_disable_at_boot(struct drm_

 	if (channel < 0)

 		return 0;

-	return vc4_crtc_disable(crtc, channel);

+	encoder_sel = VC4_GET_FIELD(CRTC_READ(PV_CONTROL), PV_CONTROL_CLK_SELECT);

+	if (WARN_ON(encoder_sel != 0))

+		return 0;

+

+	pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);

+	encoder_type = pv_data->encoder_types[encoder_sel];

+	encoder = vc4_crtc_get_encoder_by_type(crtc, encoder_type);

+	if (WARN_ON(!encoder))

+		return 0;

+

+	return vc4_crtc_disable(crtc, encoder, channel);

 }

 static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,

 				    struct drm_crtc_state *old_state)

 {

 	struct vc4_crtc_state *old_vc4_state = to_vc4_crtc_state(old_state);

+	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc);

 	struct drm_device *dev = crtc->dev;

 	require_hvs_enabled(dev);

@@ -499,7 +530,7 @@ static void vc4_crtc_atomic_disable(stru

 	/* Disable vblank irq handling before crtc is disabled. */

 	drm_crtc_vblank_off(crtc);

-	vc4_crtc_disable(crtc, old_vc4_state->assigned_channel);

+	vc4_crtc_disable(crtc, encoder, old_vc4_state->assigned_channel);

 	/*

 	 * Make sure we issue a vblank event after disabling the CRTC if