diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-07-04 22:27:24 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-07-04 22:27:24 +0000 |
| commit | 48d3e63284abfb5f01ac3afb57b898f7cf15befd (patch) | |
| tree | 5e279752a5badb78b714d3352e672712eb584293 /sys | |
| parent | a5136e2d6cd738ff9b6c5a6039072b7e60688d99 (diff) | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/drm_drv.c | 6 |
1 files 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 <oga@openbsd.org> * 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; |