diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-11 21:33:37 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-21 21:17:49 -0500 |
commit | 989aa5b76ad2af7653353cf01bdebec2ba9436aa (patch) | |
tree | 1101d4d85c6034c902f5956877f268dff1a144c9 /drivers/gpu/drm/nouveau/nv84_fence.c | |
parent | c4345146dbee38d949efd3a7b96d1bea962a29f2 (diff) |
drm/nouveau/nvif: namespace of nvkm accessors (no binary change)
NVKM is having it's namespace switched to nvkm_, which will conflict
with these functions (which are workarounds for the fact that as of
yet, we still aren't able to split DRM and NVKM completely).
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv84_fence.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv84_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c index cb5b88938d45..46fe1fb5c9be 100644 --- a/drivers/gpu/drm/nouveau/nv84_fence.c +++ b/drivers/gpu/drm/nouveau/nv84_fence.c | |||
@@ -213,7 +213,7 @@ nv84_fence_destroy(struct nouveau_drm *drm) | |||
213 | int | 213 | int |
214 | nv84_fence_create(struct nouveau_drm *drm) | 214 | nv84_fence_create(struct nouveau_drm *drm) |
215 | { | 215 | { |
216 | struct nouveau_fifo *pfifo = nvkm_fifo(&drm->device); | 216 | struct nouveau_fifo *pfifo = nvxx_fifo(&drm->device); |
217 | struct nv84_fence_priv *priv; | 217 | struct nv84_fence_priv *priv; |
218 | int ret; | 218 | int ret; |
219 | 219 | ||