[Intel-gfx] [PATCH] Revert "drm/i915: more virtual south bridge detection"

[Jani Nikula]

This reverts

commit 39bfcd5235e07e95ad3e70eab8e0b85db181de9e
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Nov 26 12:03:51 2015 +0100

    drm/i915: more virtual south bridge detection

because it mistakes real physical south bridges for virtual ones.

Reported-by: Bjørn Mork <bjorn at mork.no>
Reference: http://mid.gmane.org/87y4bes74m.fsf@nemi.mork.no
Cc: Gerd Hoffmann <kraxel at redhat.com>
Fixes: 39bfcd5235e0 ("drm/i915: more virtual south bridge detection")
Signed-off-by: Jani Nikula <jani.nikula at intel.com>

---

Bjørn, please provide your Tested-by.

Gerd, back to the drawing board, I'm afraid.
---
 drivers/gpu/drm/i915/i915_drv.c | 3 +--
 drivers/gpu/drm/i915/i915_drv.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 706b8eabfaf4..a702262daefc 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -500,8 +500,7 @@ void intel_detect_pch(struct drm_device *dev)
 				DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
 				WARN_ON(!IS_SKYLAKE(dev) &&
 					!IS_KABYLAKE(dev));
-			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
-				   (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE)) {
+			} else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = intel_virt_detect_pch(dev);
 			} else
 				continue;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index afb0beee9975..1c06661ebf08 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2645,7 +2645,6 @@ 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)
-- 
2.1.4