From 89c651e2213a148d19407109051abbf81328a4a8 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 20 Aug 2015 14:54:16 +1000
Subject: [PATCH] drm/nouveau/engine: rename some functions to avoid upcoming
conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 4 ++--
drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 4 ++--
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 4 ++--
drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h | 4 ++--
drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | 4 ++--
drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 4 ++--
drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 4 ++--
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 4 ++--
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 3212b12a70eda..f98980e15f264 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 fb8d2b5a05671..0af10f9db9e29 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 74bf2fe9a3ca3..0fd02c27b869b 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 24cfd93f65d5f..db5c3d5a07520 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 c46e5595573b5..8dae95829f664 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 312df6fa57078..67892295e51ca 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 7e6744536fa0a..fea8516220f3c 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 d2849ece1ba66..52f6a6e492167 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 ac27f511163af..a441fd3b69bc1 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 974d7a0d7a36b..45dd8b8da4c95 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);
}
--
2.30.2