From: Jani Nikula <jani.nikula@linux.intel.com>
To: Gerd Hoffmann <kraxel@redhat.com>, intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch,
"open list:INTEL DRM DRIVERS (excluding Poulsbo, Moorestow...),
linux-kernel@vger.kernel.org (open list)"
<dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>,
bjorn@mork.no
Subject: Re: [PATCH v2] drm/i915: refine qemu south bridge detection
Date: Fri, 29 Jan 2016 09:59:13 +0200 [thread overview]
Message-ID: <8760ycke9a.fsf@intel.com> (raw)
In-Reply-To: <1453719748-10944-1-git-send-email-kraxel@redhat.com>
On Mon, 25 Jan 2016, Gerd Hoffmann <kraxel@redhat.com> wrote:
> 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 ]
Incidentally, I just spotted [1]. Gerd, could you review that one
please, and (once it gets merged) post a follow-up changing our magic
numbers to those constants as well?
Thanks,
Jani.
[1] http://mid.gmane.org/1453739846-3549-1-git-send-email-robbat2@gentoo.org
>
> Reported-by: Bjørn Mork <bjorn@mork.no>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-01-29 7:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 11:02 [PATCH v2] drm/i915: refine qemu south bridge detection Gerd Hoffmann
2016-01-26 8:57 ` Bruno Wolff III
2016-01-28 16:07 ` Bruno Wolff III
2016-01-29 7:06 ` Jani Nikula
2016-01-29 7:59 ` Jani Nikula [this message]
2016-01-29 8:49 ` Gerd Hoffmann
2016-01-29 9:03 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8760ycke9a.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=bjorn@mork.no \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kraxel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox