 @@ -1820,26 +1820,31 @@ extern int drm_sg_alloc(struct drm_devic
 extern int drm_sg_free(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 			       /* ATI PCIGART support (ati_pcigart.h) */
 extern int drm_ati_pcigart_init(struct drm_device *dev,
 				struct drm_ati_pcigart_info * gart_info);
 extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
 				   struct drm_ati_pcigart_info * gart_info);
 extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
 				       size_t align);
 extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 #ifdef __NetBSD__
 extern void drm_pci_attach(device_t, const struct pci_attach_args *,
     struct pci_dev *, struct drm_device *);
 extern int drm_pci_detach(struct drm_device *, int);
 #endif
 			       /* sysfs support (drm_sysfs.c) */
 struct drm_sysfs_class;
 extern struct class *drm_sysfs_create(struct module *owner, char *name);
 extern void drm_sysfs_destroy(void);
 extern int drm_sysfs_device_add(struct drm_minor *minor);
 extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 extern void drm_sysfs_device_remove(struct drm_minor *minor);
 #ifndef __NetBSD__
 extern char *drm_get_connector_status_name(enum drm_connector_status status);
 #endif
 extern int drm_sysfs_connector_add(struct drm_connector *connector);
 extern void drm_sysfs_connector_remove(struct drm_connector *connector);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci.h,v 1.1.2.12 2013/07/24 03:20:05 riastradh Exp $	*/
+/*	$NetBSD: pci.h,v 1.1.2.13 2013/07/24 03:24:03 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -49,57 +49,80 @@ struct pci_device_id {
 	uint32_t	vendor;
 	uint32_t	device;
 	uint32_t	subvendor;
 	uint32_t	subdevice;
 	uint32_t	class;
 	uint32_t	class_mask;
 	unsigned long	driver_data;
 };
 #define	PCI_ANY_ID		((pcireg_t)-1)
 #define	PCI_BASE_CLASS_DISPLAY	PCI_CLASS_DISPLAY
-#define	PCI_CLASS_BRIDGE_ISA	PCI_SUBCLASS_BRIDGE_ISA
+#define	PCI_CLASS_BRIDGE_ISA						\
 	((PCI_CLASS_BRIDGE << 8) | PCI_SUBCLASS_BRIDGE_ISA)
 CTASSERT(PCI_CLASS_BRIDGE_ISA == 0x0601);
 #define	PCI_VENDOR_ID_INTEL	PCI_VENDOR_INTEL
 #define	PCI_DEVFN(DEV, FN)						\
 	(__SHIFTIN((DEV), __BITS(3, 7)) | __SHIFTIN((FN), __BITS(0, 2)))
 #define	PCI_SLOT(DEVFN)		__SHIFTOUT((DEVFN), __BITS(3, 7))
 #define	PCI_FUNC(DEVFN)		__SHIFTOUT((DEVFN), __BITS(0, 2))
 #define	PCI_CAP_ID_AGP	PCI_CAP_AGP
 struct pci_dev {
 	struct pci_attach_args	pd_pa;
 	bool			pd_kludged;	/* XXX pci_kludgey_find_dev */
 	device_t		pd_dev;
 	struct pci_bus		*bus;
 	uint32_t		devfn;
 	uint16_t		vendor;
 	uint16_t		device;
 	uint16_t		subsystem_vendor;
 	uint16_t		subsystem_device;
 	uint8_t			revision;
 	uint32_t		class;
 	bool 			msi_enabled;
 };
 static inline device_t
 pci_dev_dev(struct pci_dev *pdev)
+{
 	return pdev->pd_dev;
+}
-#define	PCI_DEVFN(DEV, FN)						\
+static inline void
-	(__SHIFTIN((DEV), __BITS(3, 7)) | __SHIFTIN((FN), __BITS(0, 2)))
+linux_pci_dev_init(struct pci_dev *pdev, device_t dev,
-#define	PCI_SLOT(DEVFN)		__SHIFTOUT((DEVFN), __BITS(3, 7))
+    const struct pci_attach_args *pa, bool kludged)
 #define	PCI_FUNC(DEVFN)		__SHIFTOUT((DEVFN), __BITS(0, 2))
 	const uint32_t subsystem_id = pci_conf_read(pa->pa_pc, pa->pa_tag,
 	    PCI_SUBSYS_ID_REG);
-#define	PCI_CAP_ID_AGP	PCI_CAP_AGP
+	pdev->pd_pa = *pa;
 	pdev->pd_kludged = kludged;
 	pdev->pd_dev = dev;
 	pdev->bus = NULL;	/* XXX struct pci_dev::bus */
 	pdev->devfn = PCI_DEVFN(pa->pa_device, pa->pa_function);
 	pdev->vendor = PCI_VENDOR(pa->pa_id);
 	pdev->device = PCI_PRODUCT(pa->pa_id);
 	pdev->subsystem_vendor = PCI_SUBSYS_VENDOR(subsystem_id);
 	pdev->subsystem_device = PCI_SUBSYS_ID(subsystem_id);
 	pdev->revision = PCI_REVISION(pa->pa_class);
 	pdev->class = __SHIFTOUT(pa->pa_class, 0xffffff00UL); /* ? */
 	pdev->msi_enabled = false;
+}
 static inline int
 pci_find_capability(struct pci_dev *pdev, int cap)
+{
 	return pci_get_capability(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, cap,
 	    NULL, NULL);
+}
 static inline void
 pci_read_config_dword(struct pci_dev *pdev, int reg, uint32_t *valuep)
+{
 	KASSERT(!ISSET(reg, 3));
 	*valuep = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, reg);
 @@ -220,53 +243,90 @@ pci_bus_alloc_resource(struct pci_bus *b
+	}
 	resource->r_bst = bst;
 	error = bus_space_alloc(bst, start, 0xffffffffffffffffULL /* XXX */,
 	    size, align, 0, 0, &resource->start, &resource->r_bsh);
 	if (error)
 		return error;
 	resource->size = size;
 	return 0;
+}
 /*
- * XXX Mega-kludgerific!
+ * XXX Mega-kludgerific!  pci_get_bus_and_slot and pci_get_class are
  * defined only for their single purposes in i915drm, in
- * XXX Doesn't check whether any such device actually exists.
+ * i915_get_bridge_dev and intel_detect_pch.  We can't define them more
  * generally without adapting pci_find_device (and pci_enumerate_bus
  * internally) to pass a cookie through.
  */
 static inline int		/* XXX inline?  */
 pci_kludgey_match_bus0_dev0_func0(const struct pci_attach_args *pa)
+{
 	if (pa->pa_bus != 0)
 		return 0;
 	if (pa->pa_device != 0)
 		return 0;
 	if (pa->pa_function != 0)
 		return 0;
 	return 1;
+}
 static inline struct pci_dev *
-pci_kludgey_find_dev(struct pci_dev *pdev, int bus, int dev, int func)
+pci_get_bus_and_slot(int bus, int slot)
+{
-	struct pci_dev *const otherdev = kmem_zalloc(sizeof(*otherdev),
+	struct pci_attach_args pa;
 	    KM_SLEEP);
-#ifdef DIAGNOSTIC
+	KASSERT(bus == 0);
 	KASSERT(slot == PCI_DEVFN(0, 0));
 		int obus, odev, ofunc;
 	if (!pci_find_device(&pa, &pci_kludgey_match_bus0_dev0_func0))
-		pci_decompose_tag(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, &obus,
+		return NULL;
 		    &odev, &ofunc);
-		KASSERT(obus == bus);
+	struct pci_dev *const pdev = kmem_zalloc(sizeof(*pdev), KM_SLEEP);
 	linux_pci_dev_init(pdev, NULL, &pa, true);
 #endif
 	return pdev;
+}
 static inline int		/* XXX inline?  */
 pci_kludgey_match_isa_bridge(const struct pci_attach_args *pa)
+{
 	if (PCI_CLASS(pa->pa_class) != PCI_CLASS_BRIDGE)
 		return 0;
 	if (PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_BRIDGE_ISA)
 		return 0;
 	return 1;
+}
 static inline struct pci_dev *
 pci_get_class(uint32_t class_subclass_shifted __unused,
     struct pci_dev *from __unused)
+{
 	struct pci_attach_args pa;
 	KASSERT(class_subclass_shifted == (PCI_CLASS_BRIDGE_ISA << 8));
 	KASSERT(from == NULL);
 	if (!pci_find_device(&pa, &pci_kludgey_match_isa_bridge))
 		return NULL;
-	otherdev->bus = NULL;	/* XXX struct pci_dev::bus */
+	struct pci_dev *const pdev = kmem_zalloc(sizeof(*pdev), KM_SLEEP);
-	otherdev->device = dev;
+	linux_pci_dev_init(pdev, NULL, &pa, true);
 	otherdev->pd_pa = pdev->pd_pa;
 	otherdev->pd_pa.pa_tag = pci_make_tag(otherdev->pd_pa.pa_pc,
 	    bus, dev, func);
 	otherdev->pd_kludged = true;
-	return otherdev;
+	return pdev;
+}
 static inline void
 pci_dev_put(struct pci_dev *pdev)
+{
 	KASSERT(pdev->pd_kludged);
 	kmem_free(pdev, sizeof(*pdev));
+}
 #endif  /* _LINUX_PCI_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_pci.c,v 1.1.2.1 2013/07/24 02:35:07 riastradh Exp $	*/
+/*	$NetBSD: drm_pci.c,v 1.1.2.2 2013/07/24 03:24:03 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.1 2013/07/24 02:35:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.2 2013/07/24 03:24:03 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <drm/drmP.h>
 static int	drm_pci_get_irq(struct drm_device *);
 static int	drm_pci_irq_install(struct drm_device *,
 		    irqreturn_t (*)(void *), int, const char *, void *,
 		    struct drm_bus_irq_cookie **);
 @@ -63,26 +63,48 @@ const struct drm_bus drm_pci_bus = {
 	.get_name = drm_pci_get_name,
 	.set_busid = drm_pci_set_busid,
 	.set_unique = drm_pci_set_unique,
 	.irq_by_busid = drm_pci_irq_by_busid,
 	.agp_init = drm_pci_agp_init,
 };
 static const struct pci_attach_args *
 drm_pci_attach_args(struct drm_device *dev)
+{
 	return &dev->pdev->pd_pa;
+}
 void
 drm_pci_attach(device_t self, const struct pci_attach_args *pa,
     struct pci_dev *pdev, struct drm_device *dev)
+{
 	linux_pci_dev_init(pdev, self, pa, false);
 	dev->pdev = pdev;
 	dev->pci_vendor = pdev->vendor;
 	dev->pci_device = pdev->device;
 	/* XXX Set the power state to D0?  */
+}
 int
 drm_pci_detach(struct drm_device *dev __unused, int flags __unused)
+{
 	/* XXX Disestablish irqs or anything?  */
 	return 0;
+}
 static int
 drm_pci_get_irq(struct drm_device *dev)
+{
 	pci_intr_handle_t ih_pih;
 	int ih_int;
 	/*
 	 * This is a compile-time assertion that the types match.  If
 	 * this fails, we have to change a bunch of drm code that uses
 	 * int for intr handles.
 	 */
 	KASSERT(&ih_pih != &ih_int);