diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:16 (GMT) |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:34 (GMT) |
commit | 89c651e2213a148d19407109051abbf81328a4a8 (patch) | |
tree | c491408991c4fc895302b92aa3f00746a5cf11a5 /drivers/gpu | |
parent | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (diff) | |
download | linux-89c651e2213a148d19407109051abbf81328a4a8.tar.xz |
drm/nouveau/engine: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | 4 | ||||
-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 |
10 files changed, 19 insertions, 19 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h index 3212b12..f98980e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h @@ -40,9 +40,9 @@ struct nvkm_engine *nvkm_engine(void *obj, int idx); #define nvkm_engine_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) -#define nvkm_engine_init(p) \ +#define nvkm_engine_init_old(p) \ nvkm_subdev_init_old(&(p)->subdev) -#define nvkm_engine_fini(p,s) \ +#define nvkm_engine_fini_old(p,s) \ nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *, diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h index fb8d2b5..0af10f9 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h @@ -91,9 +91,9 @@ nvkm_fifo(void *obj) #define nvkm_fifo_create(o,e,c,fc,lc,d) \ nvkm_fifo_create_((o), (e), (c), (fc), (lc), sizeof(**d), (void **)d) #define nvkm_fifo_init(p) \ - nvkm_engine_init(&(p)->engine) + nvkm_engine_init_old(&(p)->engine) #define nvkm_fifo_fini(p,s) \ - nvkm_engine_fini(&(p)->engine, (s)) + nvkm_engine_fini_old(&(p)->engine, (s)) int nvkm_fifo_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int min, int max, diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h index 74bf2fe..0fd02c2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h @@ -42,9 +42,9 @@ nvkm_gr(void *obj) #define nvkm_gr_destroy(d) \ nvkm_engine_destroy(&(d)->engine) #define nvkm_gr_init(d) \ - nvkm_engine_init(&(d)->engine) + nvkm_engine_init_old(&(d)->engine) #define nvkm_gr_fini(d,s) \ - nvkm_engine_fini(&(d)->engine, (s)) + nvkm_engine_fini_old(&(d)->engine, (s)) #define _nvkm_gr_dtor _nvkm_engine_dtor #define _nvkm_gr_init _nvkm_engine_init diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h index 24cfd93..db5c3d5 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h @@ -32,9 +32,9 @@ struct nvkm_mpeg { #define nvkm_mpeg_destroy(d) \ nvkm_engine_destroy(&(d)->engine) #define nvkm_mpeg_init(d) \ - nvkm_engine_init(&(d)->engine) + nvkm_engine_init_old(&(d)->engine) #define nvkm_mpeg_fini(d,s) \ - nvkm_engine_fini(&(d)->engine, (s)) + nvkm_engine_fini_old(&(d)->engine, (s)) #define _nvkm_mpeg_dtor _nvkm_engine_dtor #define _nvkm_mpeg_init _nvkm_engine_init diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h index c46e559..8dae958 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h @@ -33,9 +33,9 @@ struct nvkm_sw { #define nvkm_sw_destroy(d) \ nvkm_engine_destroy(&(d)->engine) #define nvkm_sw_init(d) \ - nvkm_engine_init(&(d)->engine) + nvkm_engine_init_old(&(d)->engine) #define nvkm_sw_fini(d,s) \ - nvkm_engine_fini(&(d)->engine, (s)) + nvkm_engine_fini_old(&(d)->engine, (s)) #define _nvkm_sw_dtor _nvkm_engine_dtor #define _nvkm_sw_init _nvkm_engine_init diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c index 312df6f..6789229 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 7e67445..fea8516 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 d2849ec..52f6a6e 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 ac27f51..a441fd3 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 974d7a0..45dd8b8 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); } |