diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:36:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 15:42:03 +1000 |
| commit | 7c92bfba4d743710dedb4b4c412ce0e62482cd72 (patch) | |
| tree | 7f796da0446be3afdc85c5e159079fc63a56aa8f /drm/nouveau/nouveau_drm.h | |
| parent | f614350d44564f52b5e13ddfc5ab114cf35cfe4c (diff) | |
| download | nouveau-7c92bfba4d743710dedb4b4c412ce0e62482cd72.tar.gz | |
drm: finalise nvkm namespace switch (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 'drm/nouveau/nouveau_drm.h')
| -rw-r--r-- | drm/nouveau/nouveau_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nouveau_drm.h b/drm/nouveau/nouveau_drm.h index 8ae36f265..fc68f0973 100644 --- a/drm/nouveau/nouveau_drm.h +++ b/drm/nouveau/nouveau_drm.h @@ -80,7 +80,7 @@ enum nouveau_drm_handle { struct nouveau_cli { struct nvif_client base; - struct nouveau_vm *vm; /*XXX*/ + struct nvkm_vm *vm; /*XXX*/ struct list_head head; struct mutex mutex; void *abi16; @@ -142,7 +142,7 @@ struct nouveau_drm { /* context for accelerated drm-internal operations */ struct nouveau_channel *cechan; struct nouveau_channel *channel; - struct nouveau_gpuobj *notify; + struct nvkm_gpuobj *notify; struct nouveau_fbdev *fbcon; struct nvif_object nvsw; struct nvif_object ntfy; |