summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-11-26 12:03:51 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-11-26 15:20:41 +0100
commit39bfcd5235e07e95ad3e70eab8e0b85db181de9e (patch)
tree03b9d923eed6de4aece6b4ac8df8bff5679d37e3 /drivers/gpu/drm/i915/i915_drv.c
parent2e35c8833bc737a0c87a18e9b8c0de8495467d97 (diff)
downloadop-kernel-dev-39bfcd5235e07e95ad3e70eab8e0b85db181de9e.zip
op-kernel-dev-39bfcd5235e07e95ad3e70eab8e0b85db181de9e.tar.gz
drm/i915: more virtual south bridge detection
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 649e20a..90faa8e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -565,7 +565,8 @@ 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) {
+ } 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;
OpenPOWER on IntegriCloud