From e4dbbea0811f267b56b1acefa001e9c4aa16b84a Mon Sep 17 00:00:00 2001 From: kettenis Date: Tue, 4 Jul 2017 22:27:23 +0000 Subject: [PATCH] Ignore entries with specific PCI subvendor/subdevice such that we don't inadvertedly match the Intel HD Graphics P4000 as a "Quanta transcode" device. Thanks to Joe Gidi for figuring out that I inadvertedly brought this back. Hopefully fixing it this way prevents it from happening again. --- sys/dev/pci/drm/drm_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c index 4988be277da..ec99d60cd1d 100644 --- a/sys/dev/pci/drm/drm_drv.c +++ b/sys/dev/pci/drm/drm_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_drv.c,v 1.152 2017/07/01 16:00:25 kettenis Exp $ */ +/* $OpenBSD: drm_drv.c,v 1.153 2017/07/04 22:27:23 kettenis Exp $ */ /*- * Copyright 2007-2009 Owain G. Ainsworth * Copyright © 2008 Intel Corporation @@ -559,7 +559,9 @@ drm_find_description(int vendor, int device, const struct drm_pcidev *idlist) for (i = 0; idlist[i].vendor != 0; i++) { if ((idlist[i].vendor == vendor) && - (idlist[i].device == device)) + (idlist[i].device == device) && + (idlist[i].subvendor == PCI_ANY_ID) && + (idlist[i].subdevice == PCI_ANY_ID)) return &idlist[i]; } return NULL; -- 2.20.1