Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/external/bsd/drm2 Pull up following revision(s) (requ...
details: https://anonhg.NetBSD.org/src/rev/56a768b6998f
branches: netbsd-7
changeset: 799785:56a768b6998f
user: snj <snj%NetBSD.org@localhost>
date: Thu Feb 11 22:52:58 2016 +0000
description:
Pull up following revision(s) (requested by riastradh in ticket #1080):
sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c: revision 1.14
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.8
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.7
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.7
sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: revision 1.5
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c: revision 1.5
sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c: revision 1.3
sys/external/bsd/drm2/include/linux/pci.h: revision 1.21
sys/external/bsd/drm2/include/linux/platform_device.h: revision 1.7
sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.5
Use nv_device_base(dev) like other callers, not dev->pdev->dev.
First step in fixing the struct device nonsense. This won't actually
fix anything yet until we also fix nv_device_base.
--
dev->dev, not &dev->pdev->dev.
Latter is a charlatan, soon to meet judgment for its sins.
--
dev->dev, not &dev->pdev->dev.
Latter is a mistake that is all my fault. Oops.
--
Eliminate Linux struct pci_dev::dev, struct platform_device::dev.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c | 8 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c | 2 +-
sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h | 5 ++-
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c | 7 ++--
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c | 14 ++++++++-
sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c | 2 +-
sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c | 8 ++--
sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c | 2 +-
sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c | 6 ++--
sys/external/bsd/drm2/include/linux/pci.h | 11 +-------
sys/external/bsd/drm2/include/linux/platform_device.h | 11 ++++++-
sys/external/bsd/drm2/nouveau/nouveau_pci.c | 12 ++-----
13 files changed, 48 insertions(+), 42 deletions(-)
diffs (truncated from 341 to 300 lines):
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Thu Feb 11 22:52:58 2016 +0000
@@ -656,7 +656,7 @@
"i915 gmbus %s",
gmbus_ports[i].name);
- bus->adapter.dev.parent = &dev->pdev->dev;
+ bus->adapter.dev.parent = dev->dev;
bus->dev_priv = dev_priv;
bus->adapter.algo = &gmbus_algorithm;
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Thu Feb 11 22:52:58 2016 +0000
@@ -6020,7 +6020,7 @@
void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
- struct device *device = &dev->pdev->dev;
+ struct device *device = dev->dev;
if (!HAS_RUNTIME_PM(dev))
return;
@@ -6032,7 +6032,7 @@
void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
- struct device *device = &dev->pdev->dev;
+ struct device *device = dev->dev;
if (!HAS_RUNTIME_PM(dev))
return;
@@ -6044,7 +6044,7 @@
void intel_init_runtime_pm(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
- struct device *device = &dev->pdev->dev;
+ struct device *device = dev->dev;
if (!HAS_RUNTIME_PM(dev))
return;
@@ -6061,7 +6061,7 @@
void intel_fini_runtime_pm(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
- struct device *device = &dev->pdev->dev;
+ struct device *device = dev->dev;
if (!HAS_RUNTIME_PM(dev))
return;
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Thu Feb 11 22:52:58 2016 +0000
@@ -2971,7 +2971,7 @@
sdvo->ddc.owner = THIS_MODULE;
sdvo->ddc.class = I2C_CLASS_DDC;
snprintf(sdvo->ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");
- sdvo->ddc.dev.parent = &dev->pdev->dev;
+ sdvo->ddc.dev.parent = dev->dev;
sdvo->ddc.algo_data = sdvo;
sdvo->ddc.algo = &intel_sdvo_ddc_proxy;
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h Thu Feb 11 22:52:58 2016 +0000
@@ -152,8 +152,9 @@
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__
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c Thu Feb 11 22:52:58 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_subdev_bios_base.c,v 1.1.1.1.4.1 2015/03/06 21:39:09 snj Exp $ */
+/* $NetBSD: nouveau_subdev_bios_base.c,v 1.1.1.1.4.2 2016/02/11 22:52:58 snj Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_bios_base.c,v 1.1.1.1.4.1 2015/03/06 21:39:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_bios_base.c,v 1.1.1.1.4.2 2016/02/11 22:52:58 snj Exp $");
#include <core/object.h>
#include <core/device.h>
@@ -376,7 +376,8 @@
} while ((++mthd)->shadow);
/* attempt to load firmware image */
- ret = request_firmware(&fw, source, &nv_device(bios)->pdev->dev);
+ ret = request_firmware(&fw, source,
+ nv_device_base(nv_device(bios)));
if (ret == 0) {
bios->size = fw->size;
bios->data = kmemdup(fw->data, fw->size, GFP_KERNEL);
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Thu Feb 11 22:52:58 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_drm.c,v 1.2.4.3 2015/11/06 23:03:20 riz Exp $ */
+/* $NetBSD: nouveau_drm.c,v 1.2.4.4 2016/02/11 22:52:58 snj Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.2.4.3 2015/11/06 23:03:20 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.2.4.4 2016/02/11 22:52:58 snj Exp $");
#include <linux/console.h>
#include <linux/module.h>
@@ -614,8 +614,13 @@
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 @@
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 ||
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c Thu Feb 11 22:52:58 2016 +0000
@@ -1301,7 +1301,7 @@
obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
if (obj == NULL) {
- dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
+ dev_err(dev->dev, "No GEM object associated to handle 0x%08X, "
"can't create framebuffer\n", mode_cmd->handles[0]);
return ERR_PTR(-ENOENT);
}
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c Thu Feb 11 22:52:58 2016 +0000
@@ -446,7 +446,7 @@
}
if (args->offset < RADEON_VA_RESERVED_SIZE) {
- dev_err(&dev->pdev->dev,
+ dev_err(dev->dev,
"offset 0x%lX is in reserved area 0x%X\n",
(unsigned long)args->offset,
RADEON_VA_RESERVED_SIZE);
@@ -460,13 +460,13 @@
*/
invalid_flags = RADEON_VM_PAGE_VALID | RADEON_VM_PAGE_SYSTEM;
if ((args->flags & invalid_flags)) {
- dev_err(&dev->pdev->dev, "invalid flags 0x%08X vs 0x%08X\n",
+ dev_err(dev->dev, "invalid flags 0x%08X vs 0x%08X\n",
args->flags, invalid_flags);
args->operation = RADEON_VA_RESULT_ERROR;
return -EINVAL;
}
if (!(args->flags & RADEON_VM_PAGE_SNOOPED)) {
- dev_err(&dev->pdev->dev, "only supported snooped mapping for now\n");
+ dev_err(dev->dev, "only supported snooped mapping for now\n");
args->operation = RADEON_VA_RESULT_ERROR;
return -EINVAL;
}
@@ -476,7 +476,7 @@
case RADEON_VA_UNMAP:
break;
default:
- dev_err(&dev->pdev->dev, "unsupported operation %d\n",
+ dev_err(dev->dev, "unsupported operation %d\n",
args->operation);
args->operation = RADEON_VA_RESULT_ERROR;
return -EINVAL;
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c Thu Feb 11 22:52:58 2016 +0000
@@ -917,7 +917,7 @@
i2c->rec = *rec;
i2c->adapter.owner = THIS_MODULE;
i2c->adapter.class = I2C_CLASS_DDC;
- i2c->adapter.dev.parent = &dev->pdev->dev;
+ i2c->adapter.dev.parent = dev->dev;
i2c->dev = dev;
i2c_set_adapdata(&i2c->adapter, i2c);
if (rec->mm_i2c ||
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c Thu Feb 11 22:52:58 2016 +0000
@@ -126,7 +126,7 @@
*/
r = radeon_device_init(rdev, dev, dev->pdev, flags);
if (r) {
- dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
+ dev_err(dev->dev, "Fatal error during GPU init\n");
goto out;
}
@@ -136,7 +136,7 @@
*/
r = radeon_modeset_init(rdev);
if (r)
- dev_err(&dev->pdev->dev, "Fatal error during modeset init\n");
+ dev_err(dev->dev, "Fatal error during modeset init\n");
/* Call ACPI methods: require modeset init
* but failure is not fatal
@@ -144,7 +144,7 @@
if (!r) {
acpi_status = radeon_acpi_init(rdev);
if (acpi_status)
- dev_dbg(&dev->pdev->dev,
+ dev_dbg(dev->dev,
"Error during ACPI methods call\n");
}
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/include/linux/pci.h
--- a/sys/external/bsd/drm2/include/linux/pci.h Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/include/linux/pci.h Thu Feb 11 22:52:58 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.7.2.8 2016/01/27 00:01:07 snj Exp $ */
+/* $NetBSD: pci.h,v 1.7.2.9 2016/02/11 22:52:58 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -142,7 +142,6 @@
} 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;
@@ -160,14 +159,6 @@
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)
diff -r 60347b67ff0b -r 56a768b6998f sys/external/bsd/drm2/include/linux/platform_device.h
--- a/sys/external/bsd/drm2/include/linux/platform_device.h Thu Feb 11 22:48:22 2016 +0000
+++ b/sys/external/bsd/drm2/include/linux/platform_device.h Thu Feb 11 22:52:58 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_device.h,v 1.4 2014/08/06 15:01:33 riastradh Exp $ */
+/* $NetBSD: platform_device.h,v 1.4.2.1 2016/02/11 22:52:58 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,8 +35,15 @@
#include <sys/device.h>
struct platform_device {
- struct device dev; /* XXX DON'T BELIEVE ME */
+ device_t pd_dev;
uint64_t id;
};
+static inline device_t
+platform_device_dev(const struct platform_device *platformdev)
+{
+
+ return platformdev->pd_dev;
+}
+
Home |
Main Index |
Thread Index |
Old Index