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 | |
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')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c index 312df6fa5707..67892295e51c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c @@ -163,7 +163,7 @@ g84_cipher_init(struct nvkm_object *object) struct nvkm_device *device = cipher->subdev.device; int ret; - ret = nvkm_engine_init(cipher); + ret = nvkm_engine_init_old(cipher); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c index 7e6744536fa0..fea8516220f3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c @@ -129,7 +129,7 @@ _nvkm_disp_fini(struct nvkm_object *object, bool suspend) nvkm_connector_fini(conn); } - return nvkm_engine_fini(&disp->engine, suspend); + return nvkm_engine_fini_old(&disp->engine, suspend); } int @@ -140,7 +140,7 @@ _nvkm_disp_init(struct nvkm_object *object) struct nvkm_output *outp; int ret; - ret = nvkm_engine_init(&disp->engine); + ret = nvkm_engine_init_old(&disp->engine); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c index d2849ece1ba6..52f6a6e49216 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c @@ -67,7 +67,7 @@ _nvkm_falcon_init(struct nvkm_object *object) u32 caps; /* enable engine, and determine its capabilities */ - ret = nvkm_engine_init(&falcon->engine); + ret = nvkm_engine_init_old(&falcon->engine); if (ret) return ret; @@ -254,7 +254,7 @@ _nvkm_falcon_fini(struct nvkm_object *object, bool suspend) nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000); nvkm_wr32(device, base + 0x014, 0xffffffff); - return nvkm_engine_fini(&falcon->engine, suspend); + return nvkm_engine_fini_old(&falcon->engine, suspend); } int diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index ac27f511163a..a441fd3b69bc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -813,14 +813,14 @@ int _nvkm_pm_fini(struct nvkm_object *object, bool suspend) { struct nvkm_pm *pm = (void *)object; - return nvkm_engine_fini(&pm->engine, suspend); + return nvkm_engine_fini_old(&pm->engine, suspend); } int _nvkm_pm_init(struct nvkm_object *object) { struct nvkm_pm *pm = (void *)object; - return nvkm_engine_init(&pm->engine); + return nvkm_engine_init_old(&pm->engine); } void 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); } |