1 From 3cf4a365b833d7a2e7622ad5569b9d54aebbe593 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime@cerno.tech>
3 Date: Thu, 19 Dec 2019 16:25:26 +0100
4 Subject: [PATCH] drm/vc4: hdmi: Add reset callback
6 The BCM2711 and BCM283x HDMI controllers use a slightly different reset
7 sequence, so let's add a callback to reset the controller.
9 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
11 drivers/gpu/drm/vc4/vc4_hdmi.c | 17 ++++++++++++-----
12 drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
13 2 files changed, 15 insertions(+), 5 deletions(-)
15 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
16 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
17 @@ -68,6 +68,15 @@ static int vc4_hdmi_debugfs_regs(struct
21 +static void vc4_hdmi_reset(struct vc4_hdmi *vc4_hdmi)
23 + HDMI_WRITE(HDMI_SW_RESET_CONTROL,
24 + VC4_HDMI_SW_RESET_HDMI |
25 + VC4_HDMI_SW_RESET_FORMAT_DETECT);
27 + HDMI_WRITE(HDMI_SW_RESET_CONTROL, 0);
30 static enum drm_connector_status
31 vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
33 @@ -372,11 +381,8 @@ static void vc4_hdmi_encoder_enable(stru
37 - HDMI_WRITE(HDMI_SW_RESET_CONTROL,
38 - VC4_HDMI_SW_RESET_HDMI |
39 - VC4_HDMI_SW_RESET_FORMAT_DETECT);
41 - HDMI_WRITE(HDMI_SW_RESET_CONTROL, 0);
42 + if (vc4_hdmi->variant->reset)
43 + vc4_hdmi->variant->reset(vc4_hdmi);
45 /* PHY should be in reset, like
46 * vc4_hdmi_encoder_disable() does.
47 @@ -1422,6 +1428,7 @@ static const struct vc4_hdmi_variant bcm
48 .num_registers = ARRAY_SIZE(vc4_hdmi_fields),
50 .init_resources = vc4_hdmi_init_resources,
51 + .reset = vc4_hdmi_reset,
54 static const struct of_device_id vc4_hdmi_dt_match[] = {
55 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
56 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
57 @@ -35,6 +35,9 @@ struct vc4_hdmi_variant {
58 * clocks, etc) for that variant.
60 int (*init_resources)(struct vc4_hdmi *vc4_hdmi);
62 + /* Callback to reset the HDMI block */
63 + void (*reset)(struct vc4_hdmi *vc4_hdmi);
66 /* HDMI audio information */