summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/drm_drv.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-04-07 06:43:12 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-04-07 06:43:12 +0000
commitc5f133e00a9e51a54602e76a5d13c53c1940e0ab (patch)
tree9b4f596303d7dd8553d4eed589fb752c4a831cb4 /sys/dev/pci/drm/drm_drv.c
parentfe958c73cfd5ca5e7b3698fc16df33d0c116b962 (diff)
reduce the diff to linux for drm pci vid/pid tests
ok kettenis@
Diffstat (limited to 'sys/dev/pci/drm/drm_drv.c')
-rw-r--r--sys/dev/pci/drm/drm_drv.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index ed8ffb0ee40..b6fa7932d1c 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.126 2014/03/25 17:44:39 mpi Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.127 2014/04/07 06:43:11 jsg Exp $ */
/*-
* Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
* Copyright © 2008 Intel Corporation
@@ -210,10 +210,11 @@ drm_attach(struct device *parent, struct device *self, void *aux)
dev->irq = da->irq;
dev->unique = da->busid;
dev->unique_len = da->busid_len;
- dev->pci_vendor = da->pci_vendor;
- dev->pci_device = da->pci_device;
- dev->pci_subvendor = da->pci_subvendor;
- dev->pci_subdevice = da->pci_subdevice;
+ dev->pdev = &dev->drm_pci;
+ dev->pci_vendor = dev->pdev->vendor = da->pci_vendor;
+ dev->pci_device = dev->pdev->device = da->pci_device;
+ dev->pdev->subsystem_vendor = da->pci_subvendor;
+ dev->pdev->subsystem_device = da->pci_subdevice;
dev->pc = da->pc;
dev->bridgetag = da->bridgetag;