microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:16 +10:00
Родитель d61f4c178c
Коммит aa35888ff0
22 изменённых файлов: 51 добавлений и 51 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
Просмотреть файл

@ -32,8 +32,8 @@ nv_gpuobj(void *obj)
#define nvkm_gpuobj_create(p,e,c,v,g,s,a,f,d) \ #define nvkm_gpuobj_create(p,e,c,v,g,s,a,f,d) \
nvkm_gpuobj_create_((p), (e), (c), (v), (g), (s), (a), (f), \ nvkm_gpuobj_create_((p), (e), (c), (v), (g), (s), (a), (f), \
sizeof(**d), (void **)d) sizeof(**d), (void **)d)
#define nvkm_gpuobj_init(p) nvkm_object_init(&(p)->object) #define nvkm_gpuobj_init(p) _nvkm_object_init(&(p)->object)
#define nvkm_gpuobj_fini(p,s) nvkm_object_fini(&(p)->object, (s)) #define nvkm_gpuobj_fini(p,s) _nvkm_object_fini(&(p)->object, (s))
int nvkm_gpuobj_create_(struct nvkm_object *, struct nvkm_object *, int nvkm_gpuobj_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32 pclass, struct nvkm_oclass *, u32 pclass,
struct nvkm_object *, u32 size, u32 align, struct nvkm_object *, u32 size, u32 align,

6
drivers/gpu/drm/nouveau/include/nvkm/core/object.h
Просмотреть файл

@ -50,8 +50,8 @@ nv_object(void *obj)
int nvkm_object_create_(struct nvkm_object *, struct nvkm_object *, int nvkm_object_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32, int size, void **); struct nvkm_oclass *, u32, int size, void **);
void nvkm_object_destroy(struct nvkm_object *); void nvkm_object_destroy(struct nvkm_object *);
int nvkm_object_init(struct nvkm_object *); int _nvkm_object_init(struct nvkm_object *);
int nvkm_object_fini(struct nvkm_object *, bool suspend); int _nvkm_object_fini(struct nvkm_object *, bool suspend);
int _nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, int _nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32, struct nvkm_oclass *, void *, u32,
@ -112,7 +112,7 @@ nv_ofuncs(void *obj)
return nv_oclass(obj)->ofuncs; return nv_oclass(obj)->ofuncs;
} }
int nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, int nvkm_object_old(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32, struct nvkm_oclass *, void *, u32,
struct nvkm_object **); struct nvkm_object **);
void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **); void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **);

8
drivers/gpu/drm/nouveau/include/nvkm/core/parent.h
Просмотреть файл

@ -30,9 +30,9 @@ nv_parent(void *obj)
nvkm_parent_create_((p), (e), (c), (v), (s), (m), \ nvkm_parent_create_((p), (e), (c), (v), (s), (m), \
sizeof(**d), (void **)d) sizeof(**d), (void **)d)
#define nvkm_parent_init(p) \ #define nvkm_parent_init(p) \
nvkm_object_init(&(p)->object) _nvkm_object_init(&(p)->object)
#define nvkm_parent_fini(p,s) \ #define nvkm_parent_fini(p,s) \
nvkm_object_fini(&(p)->object, (s)) _nvkm_object_fini(&(p)->object, (s))
int nvkm_parent_create_(struct nvkm_object *, struct nvkm_object *, int nvkm_parent_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32 pclass, struct nvkm_oclass *, u32 pclass,
@ -41,8 +41,8 @@ int nvkm_parent_create_(struct nvkm_object *, struct nvkm_object *,
void nvkm_parent_destroy(struct nvkm_parent *); void nvkm_parent_destroy(struct nvkm_parent *);
void _nvkm_parent_dtor(struct nvkm_object *); void _nvkm_parent_dtor(struct nvkm_object *);
#define _nvkm_parent_init nvkm_object_init #define _nvkm_parent_init _nvkm_object_init
#define _nvkm_parent_fini nvkm_object_fini #define _nvkm_parent_fini _nvkm_object_fini
int nvkm_parent_sclass(struct nvkm_object *, s32 handle, int nvkm_parent_sclass(struct nvkm_object *, s32 handle,
struct nvkm_object **pengine, struct nvkm_object **pengine,

6
drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
Просмотреть файл

@ -223,7 +223,7 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu,
.flags = flags, .flags = flags,
}; };
return nvkm_object_ctor(parent, &parent->engine->subdev.object, return nvkm_object_old(parent, &parent->engine->subdev.object,
&_nvkm_gpuobj_oclass, &args, sizeof(args), &_nvkm_gpuobj_oclass, &args, sizeof(args),
(struct nvkm_object **)pgpuobj); (struct nvkm_object **)pgpuobj);
} }
@ -288,8 +288,8 @@ nvkm_gpudup_oclass = {
.handle = NV_GPUOBJ_CLASS, .handle = NV_GPUOBJ_CLASS,
.ofuncs = &(struct nvkm_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.dtor = nvkm_gpudup_dtor, .dtor = nvkm_gpudup_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
}, },
}; };

4
drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
Просмотреть файл

@ -137,7 +137,7 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size)
* between the parent and its children (eg. PGRAPH context) * between the parent and its children (eg. PGRAPH context)
*/ */
if (engine && nv_engine(engine)->cclass) { if (engine && nv_engine(engine)->cclass) {
ret = nvkm_object_ctor(&parent->object, engine, ret = nvkm_object_old(&parent->object, engine,
nv_engine(engine)->cclass, nv_engine(engine)->cclass,
data, size, &engctx); data, size, &engctx);
if (ret) if (ret)
@ -147,7 +147,7 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size)
} }
/* finally, create new object and bind it to its handle */ /* finally, create new object and bind it to its handle */
ret = nvkm_object_ctor(engctx, engine, oclass, data, size, &object); ret = nvkm_object_old(engctx, engine, oclass, data, size, &object);
client->data = object; client->data = object;
if (ret) if (ret)
goto fail_ctor; goto fail_ctor;

10
drivers/gpu/drm/nouveau/nvkm/core/object.c
Просмотреть файл

@ -136,13 +136,13 @@ nvkm_object_destroy(struct nvkm_object *object)
} }
int int
nvkm_object_init(struct nvkm_object *object) _nvkm_object_init(struct nvkm_object *object)
{ {
return 0; return 0;
} }
int int
nvkm_object_fini(struct nvkm_object *object, bool suspend) _nvkm_object_fini(struct nvkm_object *object, bool suspend)
{ {
return 0; return 0;
} }
@ -151,12 +151,12 @@ struct nvkm_ofuncs
nvkm_object_ofuncs = { nvkm_object_ofuncs = {
.ctor = _nvkm_object_ctor, .ctor = _nvkm_object_ctor,
.dtor = nvkm_object_destroy, .dtor = nvkm_object_destroy,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
}; };
int int
nvkm_object_ctor(struct nvkm_object *parent, struct nvkm_object *engine, nvkm_object_old(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {

4
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
Просмотреть файл

@ -48,7 +48,7 @@ nvkm_subdev_reset(struct nvkm_object *obj)
int int
nvkm_subdev_init(struct nvkm_subdev *subdev) nvkm_subdev_init(struct nvkm_subdev *subdev)
{ {
int ret = nvkm_object_init(&subdev->object); int ret = _nvkm_object_init(&subdev->object);
if (ret) if (ret)
return ret; return ret;
@ -72,7 +72,7 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
nvkm_mask(device, 0x000200, subdev->unit, subdev->unit); nvkm_mask(device, 0x000200, subdev->unit, subdev->unit);
} }
return nvkm_object_fini(&subdev->object, suspend); return _nvkm_object_fini(&subdev->object, suspend);
} }
int int

2
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
Просмотреть файл

@ -152,7 +152,7 @@ nvkm_device_init(struct nvkm_device *device)
for (i = 0, c = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0, c = 0; i < NVDEV_SUBDEV_NR; i++) {
#define _(s,m) case s: if (device->oclass[s] && !device->subdev[s]) { \ #define _(s,m) case s: if (device->oclass[s] && !device->subdev[s]) { \
ret = nvkm_object_ctor(nv_object(device), NULL, \ ret = nvkm_object_old(nv_object(device), NULL, \
device->oclass[s], NULL, (s), \ device->oclass[s], NULL, (s), \
(struct nvkm_object **)&device->m); \ (struct nvkm_object **)&device->m); \
if (ret == -ENODEV) { \ if (ret == -ENODEV) { \

4
drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
Просмотреть файл

@ -185,8 +185,8 @@ static struct nvkm_ofuncs
nvkm_control_ofuncs = { nvkm_control_ofuncs = {
.ctor = _nvkm_object_ctor, .ctor = _nvkm_object_ctor,
.dtor = nvkm_object_destroy, .dtor = nvkm_object_destroy,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
.mthd = nvkm_control_mthd, .mthd = nvkm_control_mthd,
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c
Просмотреть файл

@ -106,8 +106,8 @@ static struct nvkm_ofuncs
nv04_disp_ofuncs = { nv04_disp_ofuncs = {
.ctor = _nvkm_object_ctor, .ctor = _nvkm_object_ctor,
.dtor = nvkm_object_destroy, .dtor = nvkm_object_destroy,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
.mthd = nv04_disp_mthd, .mthd = nv04_disp_mthd,
.ntfy = nvkm_disp_ntfy, .ntfy = nvkm_disp_ntfy,
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h
Просмотреть файл

@ -9,8 +9,8 @@ int nvkm_dmaobj_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void **, u32 *, struct nvkm_oclass *, void **, u32 *,
int, void **); int, void **);
#define _nvkm_dmaobj_dtor nvkm_object_destroy #define _nvkm_dmaobj_dtor nvkm_object_destroy
#define _nvkm_dmaobj_init nvkm_object_init #define _nvkm_dmaobj_init _nvkm_object_init
#define _nvkm_dmaobj_fini nvkm_object_fini #define _nvkm_dmaobj_fini _nvkm_object_fini
int _nvkm_dmaeng_ctor(struct nvkm_object *, struct nvkm_object *, int _nvkm_dmaeng_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32, struct nvkm_oclass *, void *, u32,

2
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
Просмотреть файл

@ -272,7 +272,7 @@ gk104_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
.ofuncs = &nvkm_object_ofuncs, .ofuncs = &nvkm_object_ofuncs,
}; };
args->v0.engine = engines; args->v0.engine = engines;
return nvkm_object_ctor(parent, engine, &oclass, NULL, 0, pobject); return nvkm_object_old(parent, engine, &oclass, NULL, 0, pobject);
} }
engines &= args->v0.engine; engines &= args->v0.engine;

4
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
Просмотреть файл

@ -228,8 +228,8 @@ struct nvkm_ofuncs
gf100_fermi_ofuncs = { gf100_fermi_ofuncs = {
.ctor = _nvkm_object_ctor, .ctor = _nvkm_object_ctor,
.dtor = nvkm_object_destroy, .dtor = nvkm_object_destroy,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
.mthd = gf100_fermi_mthd, .mthd = gf100_fermi_mthd,
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
Просмотреть файл

@ -1187,7 +1187,7 @@ nv04_gr_context_fini(struct nvkm_object *object, bool suspend)
nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001); nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001);
spin_unlock_irqrestore(&gr->lock, flags); spin_unlock_irqrestore(&gr->lock, flags);
return nvkm_object_fini(&chan->base, suspend); return _nvkm_object_fini(&chan->base, suspend);
} }
static struct nvkm_oclass static struct nvkm_oclass
@ -1196,7 +1196,7 @@ nv04_gr_cclass = {
.ofuncs = &(struct nvkm_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv04_gr_context_ctor, .ctor = nv04_gr_context_ctor,
.dtor = nv04_gr_context_dtor, .dtor = nv04_gr_context_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nv04_gr_context_fini, .fini = nv04_gr_context_fini,
}, },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
Просмотреть файл

@ -1111,7 +1111,7 @@ nv10_gr_context_fini(struct nvkm_object *object, bool suspend)
nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001); nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001);
spin_unlock_irqrestore(&gr->lock, flags); spin_unlock_irqrestore(&gr->lock, flags);
return nvkm_object_fini(&chan->base, suspend); return _nvkm_object_fini(&chan->base, suspend);
} }
static struct nvkm_oclass static struct nvkm_oclass
@ -1120,7 +1120,7 @@ nv10_gr_cclass = {
.ofuncs = &(struct nvkm_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv10_gr_context_ctor, .ctor = nv10_gr_context_ctor,
.dtor = nv10_gr_context_dtor, .dtor = nv10_gr_context_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nv10_gr_context_fini, .fini = nv10_gr_context_fini,
}, },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
Просмотреть файл

@ -173,8 +173,8 @@ nv31_mpeg_cclass = {
.ofuncs = &(struct nvkm_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv31_mpeg_context_ctor, .ctor = nv31_mpeg_context_ctor,
.dtor = nv31_mpeg_context_dtor, .dtor = nv31_mpeg_context_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
}, },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
Просмотреть файл

@ -419,8 +419,8 @@ static struct nvkm_ofuncs
nvkm_perfdom_ofuncs = { nvkm_perfdom_ofuncs = {
.ctor = nvkm_perfdom_ctor, .ctor = nvkm_perfdom_ctor,
.dtor = nvkm_perfdom_dtor, .dtor = nvkm_perfdom_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
.mthd = nvkm_perfdom_mthd, .mthd = nvkm_perfdom_mthd,
}; };

6
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c
Просмотреть файл

@ -94,8 +94,8 @@ nvkm_barobj_oclass = {
.ofuncs = &(struct nvkm_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nvkm_barobj_ctor, .ctor = nvkm_barobj_ctor,
.dtor = nvkm_barobj_dtor, .dtor = nvkm_barobj_dtor,
.init = nvkm_object_init, .init = _nvkm_object_init,
.fini = nvkm_object_fini, .fini = _nvkm_object_fini,
.rd32 = nvkm_barobj_rd32, .rd32 = nvkm_barobj_rd32,
.wr32 = nvkm_barobj_wr32, .wr32 = nvkm_barobj_wr32,
}, },
@ -106,7 +106,7 @@ nvkm_bar_alloc(struct nvkm_bar *bar, struct nvkm_object *parent,
struct nvkm_mem *mem, struct nvkm_object **pobject) struct nvkm_mem *mem, struct nvkm_object **pobject)
{ {
struct nvkm_object *gpuobj; struct nvkm_object *gpuobj;
int ret = nvkm_object_ctor(parent, &parent->engine->subdev.object, int ret = nvkm_object_old(parent, &parent->engine->subdev.object,
&nvkm_barobj_oclass, mem, 0, &gpuobj); &nvkm_barobj_oclass, mem, 0, &gpuobj);
if (ret == 0) if (ret == 0)
*pobject = gpuobj; *pobject = gpuobj;

2
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
Просмотреть файл

@ -72,7 +72,7 @@ nvkm_instmem_alloc(struct nvkm_instmem *imem, struct nvkm_object *parent,
{ {
struct nvkm_instmem_impl *impl = (void *)imem->subdev.object.oclass; struct nvkm_instmem_impl *impl = (void *)imem->subdev.object.oclass;
struct nvkm_instobj_args args = { .size = size, .align = align }; struct nvkm_instobj_args args = { .size = size, .align = align };
return nvkm_object_ctor(parent, &parent->engine->subdev.object, return nvkm_object_old(parent, &parent->engine->subdev.object,
impl->instobj, &args, sizeof(args), pobject); impl->instobj, &args, sizeof(args), pobject);
} }

8
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
Просмотреть файл

@ -18,15 +18,15 @@ struct nvkm_instobj_args {
_nvkm_instobj_dtor(nv_object(iobj)); \ _nvkm_instobj_dtor(nv_object(iobj)); \
}) })
#define nvkm_instobj_init(p) \ #define nvkm_instobj_init(p) \
nvkm_object_init(&(p)->base) _nvkm_object_init(&(p)->base)
#define nvkm_instobj_fini(p,s) \ #define nvkm_instobj_fini(p,s) \
nvkm_object_fini(&(p)->base, (s)) _nvkm_object_fini(&(p)->base, (s))
int nvkm_instobj_create_(struct nvkm_object *, struct nvkm_object *, int nvkm_instobj_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, int, void **); struct nvkm_oclass *, int, void **);
void _nvkm_instobj_dtor(struct nvkm_object *); void _nvkm_instobj_dtor(struct nvkm_object *);
#define _nvkm_instobj_init nvkm_object_init #define _nvkm_instobj_init _nvkm_object_init
#define _nvkm_instobj_fini nvkm_object_fini #define _nvkm_instobj_fini _nvkm_object_fini
struct nvkm_instmem_impl { struct nvkm_instmem_impl {
struct nvkm_oclass base; struct nvkm_oclass base;

2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c
Просмотреть файл

@ -96,7 +96,7 @@ nv41_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) || if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) ||
!nvkm_boolopt(device->cfgopt, "NvPCIE", true)) { !nvkm_boolopt(device->cfgopt, "NvPCIE", true)) {
return nvkm_object_ctor(parent, engine, &nv04_mmu_oclass, return nvkm_object_old(parent, engine, &nv04_mmu_oclass,
data, size, pobject); data, size, pobject);
} }

2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c
Просмотреть файл

@ -169,7 +169,7 @@ nv44_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) || if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) ||
!nvkm_boolopt(device->cfgopt, "NvPCIE", true)) { !nvkm_boolopt(device->cfgopt, "NvPCIE", true)) {
return nvkm_object_ctor(parent, engine, &nv04_mmu_oclass, return nvkm_object_old(parent, engine, &nv04_mmu_oclass,
data, size, pobject); data, size, pobject);
} }