diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c
index a0a537c4cb..b381d9867f 100644
--- a/src/mainboard/google/dedede/mainboard.c
+++ b/src/mainboard/google/dedede/mainboard.c
@@ -3,12 +3,15 @@
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <baseboard/variants.h>
+#include <bootmode.h>
 #include <console/console.h>
+#include <delay.h>
 #include <device/device.h>
 #include <drivers/tpm/cr50.h>
 #include <ec/ec.h>
 #include <security/tpm/tss.h>
 #include <soc/soc_chip.h>
+#include <timer.h>
 #include <vb2_api.h>
 
 static void mainboard_update_soc_chip_config(void)
@@ -30,12 +33,62 @@ static void mainboard_update_soc_chip_config(void)
 	}
 }
 
+static bool any_hpd_ready(const gpio_t *gpios, size_t num_gpios)
+{
+	for (size_t i = 0; i < num_gpios; i++) {
+		if (gpio_get(gpios[i]))
+			return true;
+	}
+
+	return false;
+}
+
+static void mainboard_wait_for_hpd(void)
+{
+	static const long display_timeout_ms = 3000;
+	struct stopwatch sw;
+	size_t num_gpios;
+	const gpio_t *hpd_gpios = variant_hpd_gpios(&num_gpios);
+
+	if (num_gpios == 0) {
+		printk(BIOS_WARNING, "No HPD GPIOs, skip waiting\n");
+		return;
+	}
+
+	printk(BIOS_INFO, "Waiting for HPD\n");
+
+	/* Pins will be configured back by gpio_configure_pads. */
+	for (size_t i = 0; i < num_gpios; i++) {
+		gpio_input(hpd_gpios[i]);
+	}
+
+	stopwatch_init_msecs_expire(&sw, display_timeout_ms);
+	while (!any_hpd_ready(hpd_gpios, num_gpios)) {
+		if (stopwatch_expired(&sw)) {
+			printk(BIOS_WARNING,
+			       "HPD not ready after %ld ms. Abort.\n",
+			       display_timeout_ms);
+			return;
+		}
+		mdelay(200);
+	}
+	printk(BIOS_INFO, "HPD ready after %lld ms\n",
+	       stopwatch_duration_msecs(&sw));
+}
+
 static void mainboard_init(void *chip_info)
 {
 	const struct pad_config *base_pads;
 	const struct pad_config *override_pads;
 	size_t base_num, override_num;
 
+	/*
+	 * For chromeboxes, wait for DP HPD to be asserted before
+	 * entering FSP-S, otherwise display init may fail.
+	 */
+	if (!CONFIG(SYSTEM_TYPE_LAPTOP) && display_init_required())
+		mainboard_wait_for_hpd();
+
 	base_pads = baseboard_gpio_table(&base_num);
 	override_pads = variant_override_gpio_table(&override_num);
 
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;
+}