Unverified Commit 7d73299d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Store the encoder type in the variant structure 



The vc4 CRTC will use the encoder type to control its output clock
muxing. However, this will be different from HDMI0 to HDMI1, so let's
store our type in the variant structure so that we can support multiple
controllers later on.

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/2736a86b498551ba9dbc5803c5bb910627a2550c.1599120059.git-series.maxime@cerno.tech
parent 904f668a

drivers/gpu/drm/vc4/vc4_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 


	dev_set_drvdata(dev, vc4_hdmi);

	encoder = &vc4_hdmi->encoder.base.base;

	vc4_hdmi->encoder.base.type = VC4_ENCODER_TYPE_HDMI0;

	vc4_hdmi->encoder.base.type = variant->encoder_type;

	vc4_hdmi->pdev = pdev;

	vc4_hdmi->variant = variant;
@@ -1446,6 +1446,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) 
}



static const struct vc4_hdmi_variant bcm2835_variant = {

	.encoder_type		= VC4_ENCODER_TYPE_HDMI0,

	.registers		= vc4_hdmi_fields,

	.num_registers		= ARRAY_SIZE(vc4_hdmi_fields),

drivers/gpu/drm/vc4/vc4_hdmi.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ struct vc4_hdmi; 
struct vc4_hdmi_register;



struct vc4_hdmi_variant {

	/* Encoder Type for that controller */

	enum vc4_encoder_type encoder_type;



	/* List of the registers available on that variant */

	const struct vc4_hdmi_register *registers;