mb/google/dedede: Wait for HPD on dibbi variants

Some Type-C monitors do not immediately assert HPD. If we enter FSP-S
before HDP is asserted, display initialisation may fail. So wait for
HPD.

This is similar to commit b40c6009141e ("mainboard/hatch: Fix puff DP
output on cold boots") on puff, except we don't use
google_chromeec_wait_for_displayport() since that EC command was removed
for TCPMv2 (https://crrev.com/c/4221975). Instead we use the HPD signals
only. By waiting for any HPD signal (Type-C or HDMI), we skip waiting if
HDMI is connected, which is the same behaviour as puff and fizz.

TEST=On dibbi, connect a display via a Type-C to HDMI dongle and check
the dev and recovery screens are now displayed correctly. Also check the
logs in the following cases:

Cold reboot in dev mode, Type-C to HDMI dongle:
HPD ready after 800 ms

Warm reboot in dev mode, Type-C to HDMI dongle:
HPD ready after 0 ms

Cold/warm reboot in dev mode, direct Type-C:
HPD ready after 0 ms

Cold/warm reboot in dev mode, direct HDMI:
HPD ready after 0 ms

Cold/warm reboot in dev mode, no display:
HPD not ready after 3000 ms. Abort.

Change-Id: Id4657b5d5a95a68ecbd9efcf3585cf96ad1e13e1
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78294
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sam McNally <sammc@google.com>

5 files changed, 52 insertions, 0 deletions

diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c
index f377d9a2ca..557f6bf940 100644
--- a/src/mainboard/google/dedede/variants/baseboard/gpio.c
+++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c
@@ -489,3 +489,9 @@ static const struct cros_gpio cros_gpios[] = {
 };
 
 DECLARE_WEAK_CROS_GPIOS(cros_gpios);
+
+const gpio_t *__weak variant_hpd_gpios(size_t *num)
+{
+	*num = 0;
+	return NULL;
+}
diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
index b258481fbb..bb9fd5d97d 100644
--- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
@@ -15,6 +15,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num);
 const struct pad_config *variant_sleep_gpio_table(size_t *num);
 const struct pad_config *variant_override_gpio_table(size_t *num);
 const struct pad_config *variant_romstage_gpio_table(size_t *num);
+const gpio_t *variant_hpd_gpios(size_t *num);
 
 enum s0ix_entry {
 	S0IX_EXIT,
diff --git a/src/mainboard/google/dedede/variants/boxy/gpio.c b/src/mainboard/google/dedede/variants/boxy/gpio.c
index f8ed0cfefd..e8cb9ffe81 100644
--- a/src/mainboard/google/dedede/variants/boxy/gpio.c
+++ b/src/mainboard/google/dedede/variants/boxy/gpio.c
@@ -87,3 +87,18 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(gpio_table);
 	return gpio_table;
 }
+
+static const gpio_t hpd_gpios[] = {
+	/* HDMI1 */
+	GPP_A17,
+	/* USB C0 */
+	GPP_B23,
+	/* USB C1 */
+	GPP_A16,
+};
+
+const gpio_t *variant_hpd_gpios(size_t *num)
+{
+	*num = ARRAY_SIZE(hpd_gpios);
+	return hpd_gpios;
+}
diff --git a/src/mainboard/google/dedede/variants/dibbi/gpio.c b/src/mainboard/google/dedede/variants/dibbi/gpio.c
index 89a7a77feb..2998592756 100644
--- a/src/mainboard/google/dedede/variants/dibbi/gpio.c
+++ b/src/mainboard/google/dedede/variants/dibbi/gpio.c
@@ -91,3 +91,18 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(gpio_table);
 	return gpio_table;
 }
+
+static const gpio_t hpd_gpios[] = {
+	/* HDMI1 */
+	GPP_A17,
+	/* HDMI2 */
+	GPP_A16,
+	/* USB C0 */
+	GPP_B23,
+};
+
+const gpio_t *variant_hpd_gpios(size_t *num)
+{
+	*num = ARRAY_SIZE(hpd_gpios);
+	return hpd_gpios;
+}
diff --git a/src/mainboard/google/dedede/variants/taranza/gpio.c b/src/mainboard/google/dedede/variants/taranza/gpio.c
index 89a7a77feb..2998592756 100644
--- a/src/mainboard/google/dedede/variants/taranza/gpio.c
+++ b/src/mainboard/google/dedede/variants/taranza/gpio.c
@@ -91,3 +91,18 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
 	*num = ARRAY_SIZE(gpio_table);
 	return gpio_table;
 }
+
+static const gpio_t hpd_gpios[] = {
+	/* HDMI1 */
+	GPP_A17,
+	/* HDMI2 */
+	GPP_A16,
+	/* USB C0 */
+	GPP_B23,
+};
+
+const gpio_t *variant_hpd_gpios(size_t *num)
+{
+	*num = ARRAY_SIZE(hpd_gpios);
+	return hpd_gpios;
+}