iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/engine: rename some functions to avoid upcoming conflicts

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:16 +10:00
parent 3a8c3400f3
commit 89c651e221
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
View File

@ -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 *,

4
drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
View File

@ -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,

4
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
View File

@ -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

4
drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h
View File

@ -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

4
drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
View File

@ -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

2
drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
View File

@ -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;

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
View File

@ -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;

4
drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
View File

@ -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

4
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
View File

@ -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

4
drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
View File

@ -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);
}