Module Name: src
Committed By: riastradh
Date: Tue Oct 27 13:21:19 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_nouveau.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_drm.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core: device.h
src/sys/external/bsd/drm2/include/linux: pci.h platform_device.h
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
Log Message:
Eliminate Linux struct pci_dev::dev, struct platform_device::dev.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_nouveau.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/include/linux/platform_device.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_nouveau.c
diff -u src/sys/arch/arm/nvidia/tegra_nouveau.c:1.6 src/sys/arch/arm/nvidia/tegra_nouveau.c:1.7
--- src/sys/arch/arm/nvidia/tegra_nouveau.c:1.6 Sun Oct 18 17:07:36 2015
+++ src/sys/arch/arm/nvidia/tegra_nouveau.c Tue Oct 27 13:21:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_nouveau.c,v 1.6 2015/10/18 17:07:36 jmcneill Exp $ */
+/* $NetBSD: tegra_nouveau.c,v 1.7 2015/10/27 13:21:19 riastradh Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.6 2015/10/18 17:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.7 2015/10/27 13:21:19 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -149,7 +149,7 @@ tegra_nouveau_init(device_t self)
dev->platformdev = &sc->sc_platform_dev;
dev->platformdev->id = -1;
- dev->platformdev->dev = *sc->sc_dev; /* XXX */
+ dev->platformdev->pd_dev = sc->sc_dev;
dev->platformdev->dmat = sc->sc_dmat;
dev->platformdev->nresource = 2;
dev->platformdev->resource[0].tag = bst;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.6 Tue Oct 13 01:43:47 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Tue Oct 27 13:21:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_drm.c,v 1.6 2015/10/13 01:43:47 mrg Exp $ */
+/* $NetBSD: nouveau_drm.c,v 1.7 2015/10/27 13:21:18 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.6 2015/10/13 01:43:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.7 2015/10/27 13:21:18 riastradh Exp $");
#include <linux/console.h>
#include <linux/module.h>
@@ -614,8 +614,13 @@ fail_display:
int nouveau_pmops_suspend(struct device *dev)
{
+#ifdef __NetBSD__
+ struct drm_device *drm_dev = device_private(dev);
+ struct pci_dev *pdev __unused = drm_dev->pdev;
+#else
struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev);
+#endif
int ret;
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
@@ -671,8 +676,13 @@ nouveau_do_resume(struct drm_device *dev
int nouveau_pmops_resume(struct device *dev)
{
+#ifdef __NetBSD__
+ struct drm_device *drm_dev = device_private(dev);
+ struct pci_dev *pdev __unused = drm_dev->pdev;
+#else
struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev);
+#endif
int ret;
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h:1.4 Fri Mar 6 13:44:18 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h Tue Oct 27 13:21:18 2015
@@ -152,8 +152,9 @@ nv_device_is_pci(struct nouveau_device *
static inline struct device *
nv_device_base(struct nouveau_device *device)
{
- return nv_device_is_pci(device) ? &device->pdev->dev :
- &device->platformdev->dev;
+ return nv_device_is_pci(device)
+ ? pci_dev_dev(device->pdev)
+ : platform_device_dev(device->platformdev);
}
#ifdef __NetBSD__
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.20 src/sys/external/bsd/drm2/include/linux/pci.h:1.21
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.20 Sat Oct 17 14:54:10 2015
+++ src/sys/external/bsd/drm2/include/linux/pci.h Tue Oct 27 13:21:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.20 2015/10/17 14:54:10 jmcneill Exp $ */
+/* $NetBSD: pci.h,v 1.21 2015/10/27 13:21:18 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -146,7 +146,6 @@ struct pci_dev {
} pd_resources[PCI_NUM_RESOURCES];
struct pci_conf_state *pd_saved_state;
struct acpi_devnode *pd_ad;
- struct device dev; /* XXX Don't believe me! */
struct pci_bus *bus;
uint32_t devfn;
uint16_t vendor;
@@ -164,14 +163,6 @@ pci_dev_dev(struct pci_dev *pdev)
return pdev->pd_dev;
}
-/* XXX Nouveau kludge! Don't believe me! */
-static inline struct pci_dev *
-to_pci_dev(struct device *dev)
-{
-
- return container_of(dev, struct pci_dev, dev);
-}
-
/* XXX Nouveau kludge! */
static inline struct drm_device *
pci_get_drvdata(struct pci_dev *pdev)
Index: src/sys/external/bsd/drm2/include/linux/platform_device.h
diff -u src/sys/external/bsd/drm2/include/linux/platform_device.h:1.6 src/sys/external/bsd/drm2/include/linux/platform_device.h:1.7
--- src/sys/external/bsd/drm2/include/linux/platform_device.h:1.6 Sun Oct 18 14:04:03 2015
+++ src/sys/external/bsd/drm2/include/linux/platform_device.h Tue Oct 27 13:21:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_device.h,v 1.6 2015/10/18 14:04:03 jmcneill Exp $ */
+/* $NetBSD: platform_device.h,v 1.7 2015/10/27 13:21:18 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#define NUM_PLATFORM_RESOURCE 2
struct platform_device {
- struct device dev; /* XXX DON'T BELIEVE ME */
+ device_t pd_dev;
uint64_t id;
bus_dma_tag_t dmat;
@@ -50,4 +50,11 @@ struct platform_device {
} resource[NUM_PLATFORM_RESOURCE];
};
+static inline device_t
+platform_device_dev(const struct platform_device *platformdev)
+{
+
+ return platformdev->pd_dev;
+}
+
#endif /* _LINUX_PLATFORM_DEVICE_H_ */
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.4 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.5
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.4 Sat Oct 17 12:02:44 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Tue Oct 27 13:21:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.4 2015/10/17 12:02:44 jmcneill Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.5 2015/10/27 13:21:19 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.4 2015/10/17 12:02:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.5 2015/10/27 13:21:19 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -196,19 +196,15 @@ out0: pmf_device_deregister(self);
static bool
nouveau_pci_suspend(device_t self, const pmf_qual_t *qual __unused)
{
- struct nouveau_pci_softc *const sc = device_private(self);
- struct device *const dev = &sc->sc_pci_dev.dev; /* XXX KLUDGE */
- return nouveau_pmops_suspend(dev) == 0;
+ return nouveau_pmops_suspend(self) == 0;
}
static bool
nouveau_pci_resume(device_t self, const pmf_qual_t *qual)
{
- struct nouveau_pci_softc *const sc = device_private(self);
- struct device *const dev = &sc->sc_pci_dev.dev; /* XXX KLUDGE */
- return nouveau_pmops_resume(dev) == 0;
+ return nouveau_pmops_resume(self) == 0;
}
static void
