openwrt/target/linux/brcm2708/patches-4.4/0358-Revert-Revert-drm-vc4-...

28 lines
948 B
Diff
Raw Normal View History

From 303764f1b3db23d37614ab2f8d7ede9b7aa3b5e3 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 23 May 2016 17:06:08 +0100
Subject: [PATCH 358/381] Revert "Revert "drm/vc4: Force HDMI to connected.""
This reverts commit 7da44d06540b4a191ecc74e943f3203577fce0df.
This breaks the driver on Pi3 as hotplug is implemented through a
gpio expander owned by the GPU.
We need to extend the virtual gpio driver to support this, but for
now assume hotplug is always enabled.
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -166,6 +166,8 @@ vc4_hdmi_connector_detect(struct drm_con
struct drm_device *dev = connector->dev;
struct vc4_dev *vc4 = to_vc4_dev(dev);
+ return connector_status_connected;
+
if (vc4->hdmi->hpd_gpio) {
if (gpio_get_value_cansleep(vc4->hdmi->hpd_gpio) ^
vc4->hdmi->hpd_active_low)