-
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/gr: 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
05c7145
commit e3c71eb
Showing
73 changed files
with
3,175 additions
and
3,261 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,86 +1,86 @@ | ||
| #ifndef __NOUVEAU_GR_H__ | ||
| #define __NOUVEAU_GR_H__ | ||
|
|
||
| #include <core/engine.h> | ||
| #ifndef __NVKM_GR_H__ | ||
| #define __NVKM_GR_H__ | ||
| #include <core/engctx.h> | ||
| #include <core/enum.h> | ||
|
|
||
| struct nouveau_gr_chan { | ||
| struct nouveau_engctx base; | ||
| struct nvkm_gr_chan { | ||
| struct nvkm_engctx base; | ||
| }; | ||
|
|
||
| #define nouveau_gr_context_create(p,e,c,g,s,a,f,d) \ | ||
| nouveau_engctx_create((p), (e), (c), (g), (s), (a), (f), (d)) | ||
| #define nouveau_gr_context_destroy(d) \ | ||
| nouveau_engctx_destroy(&(d)->base) | ||
| #define nouveau_gr_context_init(d) \ | ||
| nouveau_engctx_init(&(d)->base) | ||
| #define nouveau_gr_context_fini(d,s) \ | ||
| nouveau_engctx_fini(&(d)->base, (s)) | ||
| #define nvkm_gr_context_create(p,e,c,g,s,a,f,d) \ | ||
| nvkm_engctx_create((p), (e), (c), (g), (s), (a), (f), (d)) | ||
| #define nvkm_gr_context_destroy(d) \ | ||
| nvkm_engctx_destroy(&(d)->base) | ||
| #define nvkm_gr_context_init(d) \ | ||
| nvkm_engctx_init(&(d)->base) | ||
| #define nvkm_gr_context_fini(d,s) \ | ||
| nvkm_engctx_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nvkm_gr_context_dtor _nvkm_engctx_dtor | ||
| #define _nvkm_gr_context_init _nvkm_engctx_init | ||
| #define _nvkm_gr_context_fini _nvkm_engctx_fini | ||
| #define _nvkm_gr_context_rd32 _nvkm_engctx_rd32 | ||
| #define _nvkm_gr_context_wr32 _nvkm_engctx_wr32 | ||
|
|
||
| #define _nouveau_gr_context_dtor _nouveau_engctx_dtor | ||
| #define _nouveau_gr_context_init _nouveau_engctx_init | ||
| #define _nouveau_gr_context_fini _nouveau_engctx_fini | ||
| #define _nouveau_gr_context_rd32 _nouveau_engctx_rd32 | ||
| #define _nouveau_gr_context_wr32 _nouveau_engctx_wr32 | ||
| #include <core/engine.h> | ||
|
|
||
| struct nouveau_gr { | ||
| struct nouveau_engine base; | ||
| struct nvkm_gr { | ||
| struct nvkm_engine base; | ||
|
|
||
| /* Returns chipset-specific counts of units packed into an u64. | ||
| */ | ||
| u64 (*units)(struct nouveau_gr *); | ||
| u64 (*units)(struct nvkm_gr *); | ||
| }; | ||
|
|
||
| static inline struct nouveau_gr * | ||
| nouveau_gr(void *obj) | ||
| static inline struct nvkm_gr * | ||
| nvkm_gr(void *obj) | ||
| { | ||
| return (void *)nouveau_engine(obj, NVDEV_ENGINE_GR); | ||
| return (void *)nvkm_engine(obj, NVDEV_ENGINE_GR); | ||
| } | ||
|
|
||
| #define nouveau_gr_create(p,e,c,y,d) \ | ||
| nouveau_engine_create((p), (e), (c), (y), "PGR", "graphics", (d)) | ||
| #define nouveau_gr_destroy(d) \ | ||
| nouveau_engine_destroy(&(d)->base) | ||
| #define nouveau_gr_init(d) \ | ||
| nouveau_engine_init(&(d)->base) | ||
| #define nouveau_gr_fini(d,s) \ | ||
| nouveau_engine_fini(&(d)->base, (s)) | ||
| #define nvkm_gr_create(p,e,c,y,d) \ | ||
| nvkm_engine_create((p), (e), (c), (y), "PGR", "graphics", (d)) | ||
| #define nvkm_gr_destroy(d) \ | ||
| nvkm_engine_destroy(&(d)->base) | ||
| #define nvkm_gr_init(d) \ | ||
| nvkm_engine_init(&(d)->base) | ||
| #define nvkm_gr_fini(d,s) \ | ||
| nvkm_engine_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nouveau_gr_dtor _nouveau_engine_dtor | ||
| #define _nouveau_gr_init _nouveau_engine_init | ||
| #define _nouveau_gr_fini _nouveau_engine_fini | ||
| #define _nvkm_gr_dtor _nvkm_engine_dtor | ||
| #define _nvkm_gr_init _nvkm_engine_init | ||
| #define _nvkm_gr_fini _nvkm_engine_fini | ||
|
|
||
| extern struct nouveau_oclass nv04_gr_oclass; | ||
| extern struct nouveau_oclass nv10_gr_oclass; | ||
| extern struct nouveau_oclass nv20_gr_oclass; | ||
| extern struct nouveau_oclass nv25_gr_oclass; | ||
| extern struct nouveau_oclass nv2a_gr_oclass; | ||
| extern struct nouveau_oclass nv30_gr_oclass; | ||
| extern struct nouveau_oclass nv34_gr_oclass; | ||
| extern struct nouveau_oclass nv35_gr_oclass; | ||
| extern struct nouveau_oclass nv40_gr_oclass; | ||
| extern struct nouveau_oclass nv50_gr_oclass; | ||
| extern struct nouveau_oclass *nvc0_gr_oclass; | ||
| extern struct nouveau_oclass *nvc1_gr_oclass; | ||
| extern struct nouveau_oclass *nvc4_gr_oclass; | ||
| extern struct nouveau_oclass *nvc8_gr_oclass; | ||
| extern struct nouveau_oclass *nvd7_gr_oclass; | ||
| extern struct nouveau_oclass *nvd9_gr_oclass; | ||
| extern struct nouveau_oclass *nve4_gr_oclass; | ||
| extern struct nouveau_oclass *gk20a_gr_oclass; | ||
| extern struct nouveau_oclass *nvf0_gr_oclass; | ||
| extern struct nouveau_oclass *gk110b_gr_oclass; | ||
| extern struct nouveau_oclass *nv108_gr_oclass; | ||
| extern struct nouveau_oclass *gm107_gr_oclass; | ||
| extern struct nvkm_oclass nv04_gr_oclass; | ||
| extern struct nvkm_oclass nv10_gr_oclass; | ||
| extern struct nvkm_oclass nv20_gr_oclass; | ||
| extern struct nvkm_oclass nv25_gr_oclass; | ||
| extern struct nvkm_oclass nv2a_gr_oclass; | ||
| extern struct nvkm_oclass nv30_gr_oclass; | ||
| extern struct nvkm_oclass nv34_gr_oclass; | ||
| extern struct nvkm_oclass nv35_gr_oclass; | ||
| extern struct nvkm_oclass nv40_gr_oclass; | ||
| extern struct nvkm_oclass nv50_gr_oclass; | ||
| extern struct nvkm_oclass *gf100_gr_oclass; | ||
| extern struct nvkm_oclass *gf108_gr_oclass; | ||
| extern struct nvkm_oclass *gf104_gr_oclass; | ||
| extern struct nvkm_oclass *gf110_gr_oclass; | ||
| extern struct nvkm_oclass *gf117_gr_oclass; | ||
| extern struct nvkm_oclass *gf119_gr_oclass; | ||
| extern struct nvkm_oclass *gk104_gr_oclass; | ||
| extern struct nvkm_oclass *gk20a_gr_oclass; | ||
| extern struct nvkm_oclass *gk110_gr_oclass; | ||
| extern struct nvkm_oclass *gk110b_gr_oclass; | ||
| extern struct nvkm_oclass *gk208_gr_oclass; | ||
| extern struct nvkm_oclass *gm107_gr_oclass; | ||
|
|
||
| extern const struct nouveau_bitfield nv04_gr_nsource[]; | ||
| extern struct nouveau_ofuncs nv04_gr_ofuncs; | ||
| bool nv04_gr_idle(void *obj); | ||
| #include <core/enum.h> | ||
|
|
||
| extern const struct nouveau_bitfield nv10_gr_intr_name[]; | ||
| extern const struct nouveau_bitfield nv10_gr_nstatus[]; | ||
| extern const struct nvkm_bitfield nv04_gr_nsource[]; | ||
| extern struct nvkm_ofuncs nv04_gr_ofuncs; | ||
| bool nv04_gr_idle(void *obj); | ||
|
|
||
| extern const struct nouveau_enum nv50_data_error_names[]; | ||
| extern const struct nvkm_bitfield nv10_gr_intr_name[]; | ||
| extern const struct nvkm_bitfield nv10_gr_nstatus[]; | ||
|
|
||
| extern const struct nvkm_enum nv50_data_error_names[]; | ||
| #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
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.