summaryrefslogtreecommitdiff
path: root/drm/nouveau/nouveau_reg.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 12:34:00 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-19 14:23:01 +1000
commit1bc9460ce95d229eeddc710965adb0b3e4e28585 (patch)
tree2e09348e78c8c97647088907da7eecb84d8d26cf /drm/nouveau/nouveau_reg.h
parent5f3e006ff7c65e9dbb10ebcd08781410c8f2184b (diff)
downloadnouveau-1bc9460ce95d229eeddc710965adb0b3e4e28585.tar.gz
sw: rename from software (no binary change)
Shorter device name, make consistent with our engine enums. 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 'drm/nouveau/nouveau_reg.h')
-rw-r--r--drm/nouveau/nouveau_reg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nouveau_reg.h b/drm/nouveau/nouveau_reg.h
index 43a96b99e..7226f1f60 100644
--- a/drm/nouveau/nouveau_reg.h
+++ b/drm/nouveau/nouveau_reg.h
@@ -72,7 +72,7 @@
# define NV_RAMHT_CONTEXT_VALID (1<<31)
# define NV_RAMHT_CONTEXT_CHANNEL_SHIFT 24
# define NV_RAMHT_CONTEXT_ENGINE_SHIFT 16
-# define NV_RAMHT_CONTEXT_ENGINE_SOFTWARE 0
+# define NV_RAMHT_CONTEXT_ENGINE_SW 0
# define NV_RAMHT_CONTEXT_ENGINE_GRAPHICS 1
# define NV_RAMHT_CONTEXT_INSTANCE_SHIFT 0
# define NV40_RAMHT_CONTEXT_CHANNEL_SHIFT 23