diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:35:00 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 15:42:03 +1000 |
| commit | f614350d44564f52b5e13ddfc5ab114cf35cfe4c (patch) | |
| tree | bd9c79a8ebc6269d1449db9e182694082016be77 /lib | |
| parent | c78fc31c591ceeea2bd1cffc79fbb147fc5560b4 (diff) | |
| download | nouveau-f614350d44564f52b5e13ddfc5ab114cf35cfe4c.tar.gz | |
device: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/main.c | 3 | ||||
| -rw-r--r-- | lib/null.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/main.c b/lib/main.c index 25fa8d9ab..4ec98a2d8 100644 --- a/lib/main.c +++ b/lib/main.c @@ -36,7 +36,6 @@ #include <core/ioctl.h> #include <core/event.h> -#include <engine/device.h> #include <subdev/mc.h> #include "priv.h" @@ -160,7 +159,7 @@ os_init_device(struct pci_device *pdev, u64 handle, const char *cfg, const char ldev->subsystem_device = pdev->subdevice_id; name = strdup(_name); - ret = nouveau_device_create(ldev, NOUVEAU_BUS_PCI, handle, name, + ret = nouveau_device_create(ldev, NVKM_BUS_PCI, handle, name, cfg, dbg, &odev); if (ret) { fprintf(stderr, "failed to create device, %d\n", ret); diff --git a/lib/null.c b/lib/null.c index 1081b07dd..32afe568a 100644 --- a/lib/null.c +++ b/lib/null.c @@ -30,7 +30,6 @@ #include <nvif/event.h> #include <core/ioctl.h> -#include <engine/device.h> #include "priv.h" @@ -53,7 +52,7 @@ null_fini(void) static int null_init(const char *cfg, const char *dbg, bool init) { - return nouveau_device_create(&null_pci_dev, NOUVEAU_BUS_PCI, + return nouveau_device_create(&null_pci_dev, NVKM_BUS_PCI, ~0ULL, "0000:00:00.0", cfg, dbg, &null_device); } |