summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 15:35:00 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-22 12:18:06 +1000
commit9719047b4d985ca7a46819956047cca04213d63e (patch)
treeb6d260c4c32bfab742eb34a4bee1c94b113758ea /drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
parenta56866a9809d276e3bf9aee27466cee385d2b5e6 (diff)
downloadop-kernel-dev-9719047b4d985ca7a46819956047cca04213d63e.zip
op-kernel-dev-9719047b4d985ca7a46819956047cca04213d63e.tar.gz
drm/nouveau/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 'drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
index 131619b..d852bd6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
@@ -1,7 +1,8 @@
#ifndef __NV40_GR_H__
#define __NV40_GR_H__
#include <engine/gr.h>
-#include <engine/device.h>
+
+#include <core/device.h>
struct nvkm_gpuobj;
/* returns 1 if device is one of the nv4x using the 0x4497 object class,
OpenPOWER on IntegriCloud