Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc6.git3.1.vanilla.knurd.1.fc26kernel-4.8.0-0.rc6.git3.1.vanilla.knurd.1.fc25kernel-4.8.0-0.rc6.git3.1.vanilla.knurd.1.fc24kernel-4.8.0-0.rc6.git3.1.vanilla.knurd.1.fc23

4 files changed, 46 insertions, 3 deletions

diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch
index 0521f05f5..0439fac7b 100644
--- a/bcm2837-initial-support.patch
+++ b/bcm2837-initial-support.patch
@@ -152,3 +152,40 @@ index 0000000..8216bbb
 -- 
 2.9.3
 
+From accfa15f3aef0dfca46d0eee02c1846c9b230fd5 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 14 Sep 2016 19:21:29 +0100
+Subject: [PATCH] drm/vc4: Fall back to using an EDID probe in the absence of a
+ GPIO.
+
+On Pi0/1/2, we use an external GPIO line for hotplug detection, since
+the HDMI_HOTPLUG register isn't connected to anything.  However, with
+the Pi3 the HPD GPIO line has moved off to a GPIO expander that will
+be tricky to get to (the firmware is constantly polling the expander
+using i2c0, so we'll need to coordinate with it).
+
+As a stop-gap, if we don't have a GPIO line, use an EDID probe to
+detect connection.  Fixes HDMI display on the pi3.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
+index 4452f36..5adc0c7 100644
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -174,6 +174,9 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
+ 			return connector_status_disconnected;
+ 	}
+ 
++	if (drm_probe_ddc(vc4->hdmi->ddc))
++		return connector_status_connected;
++
+ 	if (HDMI_READ(VC4_HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED)
+ 		return connector_status_connected;
+ 	else
+-- 
+2.9.3
+
diff --git a/gitrev b/gitrev
index 2e995eca8..edc1a333c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-77e5bdf9f7b2d20939c8d807f3e68778d6e1557a
+4cea8776571b18db7485930cb422faa739580c8c
diff --git a/kernel.spec b/kernel.spec
index d74b6fd78..75b423dd0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2173,6 +2173,12 @@ fi
 #
 #
 %changelog
+* Thu Sep 15 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc6.git3.1
+- Linux v4.8-rc6-214-g4cea877
+
+* Thu Sep 15 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch for bcm2837 (RPi3) HDMI EDID detection
+
 * Wed Sep 14 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc6.git2.1
 - Linux v4.8-rc6-211-g77e5bdf
 
diff --git a/sources b/sources
index c7c1a5ff1..8aac1a3c7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5276563eb1f39a048e4a8a887408c031  linux-4.7.tar.xz
 fe259c02c75eec61d1aa4b1211f3c853  perf-man-4.7.tar.gz
 5c667b81145f4ebdc27d2716eab35eb5  patch-4.8-rc6.xz
-4309c6c6582391e63f7214c06f921222  patch-4.8-rc6-git2.xz
+ebc654452be5292a6ca233d9734f78dd  patch-4.8-rc6-git3.xz