4.4-stable patches

added patches:
	drm-i915-more-virtual-south-bridge-detection.patch
	drm-i915-refine-qemu-south-bridge-detection.patch

diff --git a/queue-4.4/drm-i915-more-virtual-south-bridge-detection.patch b/queue-4.4/drm-i915-more-virtual-south-bridge-detection.patch
new file mode 100644 (file)
index 0000000..e2a35c0
--- /dev/null
+++ b/queue-4.4/drm-i915-more-virtual-south-bridge-detection.patch
@@ -0,0 +1,44 @@
+From 39bfcd5235e07e95ad3e70eab8e0b85db181de9e Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Thu, 26 Nov 2015 12:03:51 +0100
+Subject: drm/i915: more virtual south bridge detection
+
+From: Gerd Hoffmann <kraxel@redhat.com>
+
+commit 39bfcd5235e07e95ad3e70eab8e0b85db181de9e upstream.
+
+Commit "30c964a drm/i915: Detect virtual south bridge" detects and
+handles the southbridge emulated by vmware esx.  Add the ich9 south
+bridge emulated by 'qemu -M q35'.
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_drv.c |    3 ++-
+ drivers/gpu/drm/i915/i915_drv.h |    1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -531,7 +531,8 @@ void intel_detect_pch(struct drm_device
+                               dev_priv->pch_type = PCH_SPT;
+                               DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
+                               WARN_ON(!IS_SKYLAKE(dev));
+-                      } else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE) {
++                      } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
++                                 (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE)) {
+                               dev_priv->pch_type = intel_virt_detect_pch(dev);
+                       } else
+                               continue;
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -2614,6 +2614,7 @@ struct drm_i915_cmd_table {
+ #define INTEL_PCH_SPT_DEVICE_ID_TYPE          0xA100
+ #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE               0x9D00
+ #define INTEL_PCH_P2X_DEVICE_ID_TYPE          0x7100
++#define INTEL_PCH_QEMU_DEVICE_ID_TYPE         0x2900 /* qemu q35 has 2918 */
+ 
+ #define INTEL_PCH_TYPE(dev) (__I915__(dev)->pch_type)
+ #define HAS_PCH_SPT(dev) (INTEL_PCH_TYPE(dev) == PCH_SPT)

diff --git a/queue-4.4/drm-i915-refine-qemu-south-bridge-detection.patch b/queue-4.4/drm-i915-refine-qemu-south-bridge-detection.patch
new file mode 100644 (file)
index 0000000..dabd437
--- /dev/null
+++ b/queue-4.4/drm-i915-refine-qemu-south-bridge-detection.patch
@@ -0,0 +1,49 @@
+From f2e305108faba0c85eb4ba4066599decb675117e Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 25 Jan 2016 12:02:28 +0100
+Subject: drm/i915: refine qemu south bridge detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Gerd Hoffmann <kraxel@redhat.com>
+
+commit f2e305108faba0c85eb4ba4066599decb675117e upstream.
+
+The test for the qemu q35 south bridge added by commit
+"39bfcd52 drm/i915: more virtual south bridge detection"
+also matches on real hardware.  Having the check for
+virtual systems last in the list is not enough to avoid
+that ...
+
+Refine the check by additionally verifying the pci
+subsystem id to see whenever it *really* is qemu.
+
+[ v2: fix subvendor tyops ]
+
+Reported-and-tested-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Tested-by: Bruno Wolff III <bruno@wolff.to>
+Cc: drm-intel-fixes@lists.freedesktop.org
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1453719748-10944-1-git-send-email-kraxel@redhat.com
+(cherry picked from commit 1e859111c128265f8d62b39ff322e42b1ddb5a20)
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_drv.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -532,7 +532,9 @@ void intel_detect_pch(struct drm_device
+                               DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
+                               WARN_ON(!IS_SKYLAKE(dev));
+                       } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
+-                                 (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE)) {
++                                 ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
++                                  pch->subsystem_vendor == 0x1af4 &&
++                                  pch->subsystem_device == 0x1100)) {
+                               dev_priv->pch_type = intel_virt_detect_pch(dev);
+                       } else
+                               continue;

diff --git a/queue-4.4/series b/queue-4.4/series
index 92afe1f32b414aa7c192e4705f5d3a31e55cf022..2eef3894eae333034e63f8a83641d5571911fc67 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -68,3 +68,5 @@ thermal-cpu_cooling-fix-out-of-bounds-access-in-time_in_idle.patch
 drm-amdgpu-use-drm_calloc_large-for-vm-page_tables-array.patch
 block-check-virt-boundary-in-bio_will_gap.patch
 block-get-the-1st-and-last-bvec-via-helpers.patch
+drm-i915-more-virtual-south-bridge-detection.patch
+drm-i915-refine-qemu-south-bridge-detection.patch