diff options
| -rw-r--r-- | arch/riscv/configs/starfive_jh7110_defconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/verisilicon/inno_hdmi.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index 09ea78f4d188..036dcdcc6e02 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -86,6 +86,7 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y CONFIG_CFG80211=y CONFIG_MAC80211=y +CONFIG_RFKILL=y CONFIG_NET_9P=y CONFIG_NET_9P_VIRTIO=y CONFIG_PCI=y diff --git a/drivers/gpu/drm/verisilicon/inno_hdmi.c b/drivers/gpu/drm/verisilicon/inno_hdmi.c index 804b25cde83f..49dc56d397a3 100644 --- a/drivers/gpu/drm/verisilicon/inno_hdmi.c +++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c @@ -525,6 +525,8 @@ static void inno_hdmi_encoder_enable(struct drm_encoder *encoder) if (ret < 0) return; + mdelay(10); + inno_hdmi_setup(hdmi, &hdmi->previous_mode); } |