-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/nouveau/fifo: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_, which will be used for the DRM part of the driver. This is being done in order to make it very clear as to what part of the driver a given symbol belongs to, and as a minor step towards splitting the DRM driver out to be able to stand on its own (for virt). Because there's already a large amount of churn here anyway, this is as good a time as any to also switch to NVIDIA's device and chipset naming to ease collaboration with them. A comparison of objdump disassemblies proves no code changes. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
- Loading branch information
Ben Skeggs
committed
Jan 22, 2015
1 parent
5b85057
commit 05c7145
Showing
22 changed files
with
1,126 additions
and
1,188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,126 @@ | ||
| #ifndef __NOUVEAU_FIFO_H__ | ||
| #define __NOUVEAU_FIFO_H__ | ||
|
|
||
| #ifndef __NVKM_FIFO_H__ | ||
| #define __NVKM_FIFO_H__ | ||
| #include <core/namedb.h> | ||
| #include <core/gpuobj.h> | ||
| #include <core/engine.h> | ||
| #include <core/event.h> | ||
|
|
||
| struct nouveau_fifo_chan { | ||
| struct nouveau_namedb namedb; | ||
| struct nouveau_dmaobj *pushdma; | ||
| struct nouveau_gpuobj *pushgpu; | ||
| struct nvkm_fifo_chan { | ||
| struct nvkm_namedb namedb; | ||
| struct nvkm_dmaobj *pushdma; | ||
| struct nvkm_gpuobj *pushgpu; | ||
| void __iomem *user; | ||
| u64 addr; | ||
| u32 size; | ||
| u16 chid; | ||
| atomic_t refcnt; /* NV04_NVSW_SET_REF */ | ||
| }; | ||
|
|
||
| static inline struct nouveau_fifo_chan * | ||
| nouveau_fifo_chan(void *obj) | ||
| static inline struct nvkm_fifo_chan * | ||
| nvkm_fifo_chan(void *obj) | ||
| { | ||
| return (void *)nv_namedb(obj); | ||
| } | ||
|
|
||
| #define nouveau_fifo_channel_create(p,e,c,b,a,s,n,m,d) \ | ||
| nouveau_fifo_channel_create_((p), (e), (c), (b), (a), (s), (n), \ | ||
| #define nvkm_fifo_channel_create(p,e,c,b,a,s,n,m,d) \ | ||
| nvkm_fifo_channel_create_((p), (e), (c), (b), (a), (s), (n), \ | ||
| (m), sizeof(**d), (void **)d) | ||
| #define nouveau_fifo_channel_init(p) \ | ||
| nouveau_namedb_init(&(p)->namedb) | ||
| #define nouveau_fifo_channel_fini(p,s) \ | ||
| nouveau_namedb_fini(&(p)->namedb, (s)) | ||
|
|
||
| int nouveau_fifo_channel_create_(struct nouveau_object *, | ||
| struct nouveau_object *, | ||
| struct nouveau_oclass *, | ||
| #define nvkm_fifo_channel_init(p) \ | ||
| nvkm_namedb_init(&(p)->namedb) | ||
| #define nvkm_fifo_channel_fini(p,s) \ | ||
| nvkm_namedb_fini(&(p)->namedb, (s)) | ||
|
|
||
| int nvkm_fifo_channel_create_(struct nvkm_object *, | ||
| struct nvkm_object *, | ||
| struct nvkm_oclass *, | ||
| int bar, u32 addr, u32 size, u32 push, | ||
| u64 engmask, int len, void **); | ||
| void nouveau_fifo_channel_destroy(struct nouveau_fifo_chan *); | ||
| void nvkm_fifo_channel_destroy(struct nvkm_fifo_chan *); | ||
|
|
||
| #define _nouveau_fifo_channel_init _nouveau_namedb_init | ||
| #define _nouveau_fifo_channel_fini _nouveau_namedb_fini | ||
| #define _nvkm_fifo_channel_init _nvkm_namedb_init | ||
| #define _nvkm_fifo_channel_fini _nvkm_namedb_fini | ||
|
|
||
| void _nouveau_fifo_channel_dtor(struct nouveau_object *); | ||
| int _nouveau_fifo_channel_map(struct nouveau_object *, u64 *, u32 *); | ||
| u32 _nouveau_fifo_channel_rd32(struct nouveau_object *, u64); | ||
| void _nouveau_fifo_channel_wr32(struct nouveau_object *, u64, u32); | ||
| int _nouveau_fifo_channel_ntfy(struct nouveau_object *, u32, struct nvkm_event **); | ||
| void _nvkm_fifo_channel_dtor(struct nvkm_object *); | ||
| int _nvkm_fifo_channel_map(struct nvkm_object *, u64 *, u32 *); | ||
| u32 _nvkm_fifo_channel_rd32(struct nvkm_object *, u64); | ||
| void _nvkm_fifo_channel_wr32(struct nvkm_object *, u64, u32); | ||
| int _nvkm_fifo_channel_ntfy(struct nvkm_object *, u32, struct nvkm_event **); | ||
|
|
||
| struct nouveau_fifo_base { | ||
| struct nouveau_gpuobj gpuobj; | ||
| #include <core/gpuobj.h> | ||
|
|
||
| struct nvkm_fifo_base { | ||
| struct nvkm_gpuobj gpuobj; | ||
| }; | ||
|
|
||
| #define nouveau_fifo_context_create(p,e,c,g,s,a,f,d) \ | ||
| nouveau_gpuobj_create((p), (e), (c), 0, (g), (s), (a), (f), (d)) | ||
| #define nouveau_fifo_context_destroy(p) \ | ||
| nouveau_gpuobj_destroy(&(p)->gpuobj) | ||
| #define nouveau_fifo_context_init(p) \ | ||
| nouveau_gpuobj_init(&(p)->gpuobj) | ||
| #define nouveau_fifo_context_fini(p,s) \ | ||
| nouveau_gpuobj_fini(&(p)->gpuobj, (s)) | ||
| #define nvkm_fifo_context_create(p,e,c,g,s,a,f,d) \ | ||
| nvkm_gpuobj_create((p), (e), (c), 0, (g), (s), (a), (f), (d)) | ||
| #define nvkm_fifo_context_destroy(p) \ | ||
| nvkm_gpuobj_destroy(&(p)->gpuobj) | ||
| #define nvkm_fifo_context_init(p) \ | ||
| nvkm_gpuobj_init(&(p)->gpuobj) | ||
| #define nvkm_fifo_context_fini(p,s) \ | ||
| nvkm_gpuobj_fini(&(p)->gpuobj, (s)) | ||
|
|
||
| #define _nvkm_fifo_context_dtor _nvkm_gpuobj_dtor | ||
| #define _nvkm_fifo_context_init _nvkm_gpuobj_init | ||
| #define _nvkm_fifo_context_fini _nvkm_gpuobj_fini | ||
| #define _nvkm_fifo_context_rd32 _nvkm_gpuobj_rd32 | ||
| #define _nvkm_fifo_context_wr32 _nvkm_gpuobj_wr32 | ||
|
|
||
| #define _nouveau_fifo_context_dtor _nouveau_gpuobj_dtor | ||
| #define _nouveau_fifo_context_init _nouveau_gpuobj_init | ||
| #define _nouveau_fifo_context_fini _nouveau_gpuobj_fini | ||
| #define _nouveau_fifo_context_rd32 _nouveau_gpuobj_rd32 | ||
| #define _nouveau_fifo_context_wr32 _nouveau_gpuobj_wr32 | ||
| #include <core/engine.h> | ||
| #include <core/event.h> | ||
|
|
||
| struct nouveau_fifo { | ||
| struct nouveau_engine base; | ||
| struct nvkm_fifo { | ||
| struct nvkm_engine base; | ||
|
|
||
| struct nvkm_event cevent; /* channel creation event */ | ||
| struct nvkm_event uevent; /* async user trigger */ | ||
|
|
||
| struct nouveau_object **channel; | ||
| struct nvkm_object **channel; | ||
| spinlock_t lock; | ||
| u16 min; | ||
| u16 max; | ||
|
|
||
| int (*chid)(struct nouveau_fifo *, struct nouveau_object *); | ||
| void (*pause)(struct nouveau_fifo *, unsigned long *); | ||
| void (*start)(struct nouveau_fifo *, unsigned long *); | ||
| int (*chid)(struct nvkm_fifo *, struct nvkm_object *); | ||
| void (*pause)(struct nvkm_fifo *, unsigned long *); | ||
| void (*start)(struct nvkm_fifo *, unsigned long *); | ||
| }; | ||
|
|
||
| static inline struct nouveau_fifo * | ||
| nouveau_fifo(void *obj) | ||
| static inline struct nvkm_fifo * | ||
| nvkm_fifo(void *obj) | ||
| { | ||
| return (void *)nouveau_engine(obj, NVDEV_ENGINE_FIFO); | ||
| return (void *)nvkm_engine(obj, NVDEV_ENGINE_FIFO); | ||
| } | ||
|
|
||
| #define nouveau_fifo_create(o,e,c,fc,lc,d) \ | ||
| nouveau_fifo_create_((o), (e), (c), (fc), (lc), sizeof(**d), (void **)d) | ||
| #define nouveau_fifo_init(p) \ | ||
| nouveau_engine_init(&(p)->base) | ||
| #define nouveau_fifo_fini(p,s) \ | ||
| nouveau_engine_fini(&(p)->base, (s)) | ||
| #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)->base) | ||
| #define nvkm_fifo_fini(p,s) \ | ||
| nvkm_engine_fini(&(p)->base, (s)) | ||
|
|
||
| int nouveau_fifo_create_(struct nouveau_object *, struct nouveau_object *, | ||
| struct nouveau_oclass *, int min, int max, | ||
| int nvkm_fifo_create_(struct nvkm_object *, struct nvkm_object *, | ||
| struct nvkm_oclass *, int min, int max, | ||
| int size, void **); | ||
| void nouveau_fifo_destroy(struct nouveau_fifo *); | ||
| void nvkm_fifo_destroy(struct nvkm_fifo *); | ||
| const char * | ||
| nouveau_client_name_for_fifo_chid(struct nouveau_fifo *fifo, u32 chid); | ||
|
|
||
| #define _nouveau_fifo_init _nouveau_engine_init | ||
| #define _nouveau_fifo_fini _nouveau_engine_fini | ||
|
|
||
| extern struct nouveau_oclass *nv04_fifo_oclass; | ||
| extern struct nouveau_oclass *nv10_fifo_oclass; | ||
| extern struct nouveau_oclass *nv17_fifo_oclass; | ||
| extern struct nouveau_oclass *nv40_fifo_oclass; | ||
| extern struct nouveau_oclass *nv50_fifo_oclass; | ||
| extern struct nouveau_oclass *nv84_fifo_oclass; | ||
| extern struct nouveau_oclass *nvc0_fifo_oclass; | ||
| extern struct nouveau_oclass *nve0_fifo_oclass; | ||
| extern struct nouveau_oclass *gk20a_fifo_oclass; | ||
| extern struct nouveau_oclass *nv108_fifo_oclass; | ||
|
|
||
| int nouveau_fifo_uevent_ctor(struct nouveau_object *, void *, u32, | ||
| struct nvkm_notify *); | ||
| void nouveau_fifo_uevent(struct nouveau_fifo *); | ||
|
|
||
| void nv04_fifo_intr(struct nouveau_subdev *); | ||
| int nv04_fifo_context_attach(struct nouveau_object *, struct nouveau_object *); | ||
|
|
||
| nvkm_client_name_for_fifo_chid(struct nvkm_fifo *fifo, u32 chid); | ||
|
|
||
| #define _nvkm_fifo_init _nvkm_engine_init | ||
| #define _nvkm_fifo_fini _nvkm_engine_fini | ||
|
|
||
| extern struct nvkm_oclass *nv04_fifo_oclass; | ||
| extern struct nvkm_oclass *nv10_fifo_oclass; | ||
| extern struct nvkm_oclass *nv17_fifo_oclass; | ||
| extern struct nvkm_oclass *nv40_fifo_oclass; | ||
| extern struct nvkm_oclass *nv50_fifo_oclass; | ||
| extern struct nvkm_oclass *g84_fifo_oclass; | ||
| extern struct nvkm_oclass *gf100_fifo_oclass; | ||
| extern struct nvkm_oclass *gk104_fifo_oclass; | ||
| extern struct nvkm_oclass *gk20a_fifo_oclass; | ||
| extern struct nvkm_oclass *gk208_fifo_oclass; | ||
|
|
||
| int nvkm_fifo_uevent_ctor(struct nvkm_object *, void *, u32, | ||
| struct nvkm_notify *); | ||
| void nvkm_fifo_uevent(struct nvkm_fifo *); | ||
|
|
||
| void nv04_fifo_intr(struct nvkm_subdev *); | ||
| int nv04_fifo_context_attach(struct nvkm_object *, struct nvkm_object *); | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.