Attachment 121914 Details for Bug 94256 – fix-qemu-south-bridge-detection

[patch] fix-qemu-south-bridge-detection

fix-qemu-south-bridge-detection.patch (text/plain), 1.62 KB, created by Imre Deak on 2016-02-23 09:58:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2016-02-23 09:58:59 UTC

Size: 1.62 KB

patch

obsolete

>commit f2e305108faba0c85eb4ba4066599decb675117e
>Author: Gerd Hoffmann <kraxel@redhat.com>
>Date:   Mon Jan 25 12:02:28 2016 +0100
>
>    drm/i915: refine qemu south bridge detection
>    
>    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)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 3ac616d..f357058 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -501,7 +501,9 @@ void intel_detect_pch(struct drm_device *dev)
> 				WARN_ON(!IS_SKYLAKE(dev) &&
> 					!IS_KABYLAKE(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;

Actions: View | Splinter Review

Attachments on bug 94256: 121901 | 121914

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.