Commit 7d73299d authored by Maxime Ripard's avatar Maxime Ripard

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
...@@ -1267,7 +1267,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) ...@@ -1267,7 +1267,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
dev_set_drvdata(dev, vc4_hdmi); dev_set_drvdata(dev, vc4_hdmi);
encoder = &vc4_hdmi->encoder.base.base; 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->pdev = pdev;
vc4_hdmi->variant = variant; vc4_hdmi->variant = variant;
...@@ -1446,6 +1446,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) ...@@ -1446,6 +1446,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev)
} }
static const struct vc4_hdmi_variant bcm2835_variant = { static const struct vc4_hdmi_variant bcm2835_variant = {
.encoder_type = VC4_ENCODER_TYPE_HDMI0,
.registers = vc4_hdmi_fields, .registers = vc4_hdmi_fields,
.num_registers = ARRAY_SIZE(vc4_hdmi_fields), .num_registers = ARRAY_SIZE(vc4_hdmi_fields),
......
...@@ -27,6 +27,9 @@ struct vc4_hdmi; ...@@ -27,6 +27,9 @@ struct vc4_hdmi;
struct vc4_hdmi_register; struct vc4_hdmi_register;
struct vc4_hdmi_variant { struct vc4_hdmi_variant {
/* Encoder Type for that controller */
enum vc4_encoder_type encoder_type;
/* List of the registers available on that variant */ /* List of the registers available on that variant */
const struct vc4_hdmi_register *registers; const struct vc4_hdmi_register *registers;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment