 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_engine_device_base.c,v 1.4 2015/03/06 13:44:18 riastradh Exp $	*/
+/*	$NetBSD: nouveau_engine_device_base.c,v 1.5 2015/10/17 21:13:38 jmcneill Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.4 2015/03/06 13:44:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.5 2015/10/17 21:13:38 jmcneill Exp $");
 #include <core/object.h>
 #include <core/device.h>
 #include <core/client.h>
 #include <core/option.h>
 #include <core/class.h>
 #include "priv.h"
 #ifdef __NetBSD__
 static struct mutex nv_devices_mutex;
 static struct list_head nv_devices = LIST_HEAD_INIT(nv_devices);
 @@ -518,61 +518,63 @@ nouveau_device_dtor(struct nouveau_objec
 #ifdef __NetBSD__
 bus_space_tag_t
 nv_device_resource_tag(struct nouveau_device *device, unsigned int bar)
+{
 	if (nv_device_is_pci(device)) {
 		const struct pci_attach_args *const pa = &device->pdev->pd_pa;
 		if (PCI_MAPREG_TYPE(pci_mapreg_type(pa->pa_pc, pa->pa_tag,
 			    PCI_BAR(bar))) == PCI_MAPREG_TYPE_MEM)
 			return pa->pa_memt;
 		else
 			return pa->pa_iot;
 	} else {
-		/* XXX nouveau platform device */
+		KASSERT(bar < device->platformdev->nresource);
-		panic("can't handle non-PCI nouveau devices");
+		return device->platformdev->resource[bar].tag;
+	}
+}
 #endif
 resource_size_t
 nv_device_resource_start(struct nouveau_device *device, unsigned int bar)
+{
 	if (nv_device_is_pci(device)) {
 		return pci_resource_start(device->pdev, bar);
 	} else {
 #ifdef __NetBSD__
-		/* XXX nouveau platform device */
+		if (bar >= device->platformdev->nresource)
-		panic("can't handle non-PCI nouveau devices");
+			return 0;
 		return device->platformdev->resource[bar].start;
 #else
 		struct resource *res;
 		res = platform_get_resource(device->platformdev,
 					    IORESOURCE_MEM, bar);
 		if (!res)
 			return 0;
 		return res->start;
 #endif
+	}
+}
 resource_size_t
 nv_device_resource_len(struct nouveau_device *device, unsigned int bar)
+{
 	if (nv_device_is_pci(device)) {
 		return pci_resource_len(device->pdev, bar);
 	} else {
 #ifdef __NetBSD__
-		/* XXX nouveau platform device */
+		if (bar >= device->platformdev->nresource)
-		panic("can't handle non-PCI nouveau devices");
+			return 0;
 		return device->platformdev->resource[bar].len;
 #else
 		struct resource *res;
 		res = platform_get_resource(device->platformdev,
 					    IORESOURCE_MEM, bar);
 		if (!res)
 			return 0;
 		return resource_size(res);
 #endif
+	}
+}
 #ifndef __NetBSD__
 dma_addr_t

 @@ -1,14 +1,14 @@
-/*	$NetBSD: platform_device.h,v 1.4 2014/08/06 15:01:33 riastradh Exp $	*/
+/*	$NetBSD: platform_device.h,v 1.5 2015/10/17 21:13:38 jmcneill 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.
 @@ -23,20 +23,30 @@
  * 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.
  */
 #ifndef _LINUX_PLATFORM_DEVICE_H_
 #define _LINUX_PLATFORM_DEVICE_H_
 #include <sys/device.h>
 #include <sys/bus.h>
 #define NUM_PLATFORM_RESOURCE	2
 struct platform_device {
 	struct device	dev;	/* XXX DON'T BELIEVE ME */
 	uint64_t	id;
 	unsigned int	nresource;
 	struct {
 		bus_space_tag_t	tag;
 		bus_addr_t	start;
 		bus_size_t	len;
 	}		resource[NUM_PLATFORM_RESOURCE];
 };
 #endif  /* _LINUX_PLATFORM_DEVICE_H_ */