diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:34 +1000 |
| commit | 89c651e2213a148d19407109051abbf81328a4a8 (patch) | |
| tree | c491408991c4fc895302b92aa3f00746a5cf11a5 /drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | |
| parent | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (diff) | |
drm/nouveau/engine: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c index 974d7a0d7a36..45dd8b8da4c9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c @@ -90,7 +90,7 @@ _nvkm_xtensa_init(struct nvkm_object *object) int i, ret; u32 tmp; - ret = nvkm_engine_init(&xtensa->engine); + ret = nvkm_engine_init_old(&xtensa->engine); if (ret) return ret; @@ -161,5 +161,5 @@ _nvkm_xtensa_fini(struct nvkm_object *object, bool suspend) if (!suspend) nvkm_gpuobj_ref(NULL, &xtensa->gpu_fw); - return nvkm_engine_fini(&xtensa->engine, suspend); + return nvkm_engine_fini_old(&xtensa->engine, suspend); } |