-
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/sw: 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
25a6402
commit f84aff4
Showing
11 changed files
with
203 additions
and
232 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,51 +1,50 @@ | ||
| #ifndef __NOUVEAU_SW_H__ | ||
| #define __NOUVEAU_SW_H__ | ||
|
|
||
| #include <core/engine.h> | ||
| #ifndef __NVKM_SW_H__ | ||
| #define __NVKM_SW_H__ | ||
| #include <core/engctx.h> | ||
|
|
||
| struct nouveau_sw_chan { | ||
| struct nouveau_engctx base; | ||
| struct nvkm_sw_chan { | ||
| struct nvkm_engctx base; | ||
|
|
||
| int (*flip)(void *); | ||
| void *flip_data; | ||
| }; | ||
|
|
||
| #define nouveau_sw_context_create(p,e,c,d) \ | ||
| nouveau_engctx_create((p), (e), (c), (p), 0, 0, 0, (d)) | ||
| #define nouveau_sw_context_destroy(d) \ | ||
| nouveau_engctx_destroy(&(d)->base) | ||
| #define nouveau_sw_context_init(d) \ | ||
| nouveau_engctx_init(&(d)->base) | ||
| #define nouveau_sw_context_fini(d,s) \ | ||
| nouveau_engctx_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nouveau_sw_context_dtor _nouveau_engctx_dtor | ||
| #define _nouveau_sw_context_init _nouveau_engctx_init | ||
| #define _nouveau_sw_context_fini _nouveau_engctx_fini | ||
|
|
||
| struct nouveau_sw { | ||
| struct nouveau_engine base; | ||
| }; | ||
|
|
||
| #define nouveau_sw_create(p,e,c,d) \ | ||
| nouveau_engine_create((p), (e), (c), true, "SW", "software", (d)) | ||
| #define nouveau_sw_destroy(d) \ | ||
| nouveau_engine_destroy(&(d)->base) | ||
| #define nouveau_sw_init(d) \ | ||
| nouveau_engine_init(&(d)->base) | ||
| #define nouveau_sw_fini(d,s) \ | ||
| nouveau_engine_fini(&(d)->base, (s)) | ||
| #define nvkm_sw_context_create(p,e,c,d) \ | ||
| nvkm_engctx_create((p), (e), (c), (p), 0, 0, 0, (d)) | ||
| #define nvkm_sw_context_destroy(d) \ | ||
| nvkm_engctx_destroy(&(d)->base) | ||
| #define nvkm_sw_context_init(d) \ | ||
| nvkm_engctx_init(&(d)->base) | ||
| #define nvkm_sw_context_fini(d,s) \ | ||
| nvkm_engctx_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nouveau_sw_dtor _nouveau_engine_dtor | ||
| #define _nouveau_sw_init _nouveau_engine_init | ||
| #define _nouveau_sw_fini _nouveau_engine_fini | ||
| #define _nvkm_sw_context_dtor _nvkm_engctx_dtor | ||
| #define _nvkm_sw_context_init _nvkm_engctx_init | ||
| #define _nvkm_sw_context_fini _nvkm_engctx_fini | ||
|
|
||
| extern struct nouveau_oclass *nv04_sw_oclass; | ||
| extern struct nouveau_oclass *nv10_sw_oclass; | ||
| extern struct nouveau_oclass *nv50_sw_oclass; | ||
| extern struct nouveau_oclass *nvc0_sw_oclass; | ||
| #include <core/engine.h> | ||
|
|
||
| void nv04_sw_intr(struct nouveau_subdev *); | ||
| struct nvkm_sw { | ||
| struct nvkm_engine base; | ||
| }; | ||
|
|
||
| #define nvkm_sw_create(p,e,c,d) \ | ||
| nvkm_engine_create((p), (e), (c), true, "SW", "software", (d)) | ||
| #define nvkm_sw_destroy(d) \ | ||
| nvkm_engine_destroy(&(d)->base) | ||
| #define nvkm_sw_init(d) \ | ||
| nvkm_engine_init(&(d)->base) | ||
| #define nvkm_sw_fini(d,s) \ | ||
| nvkm_engine_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nvkm_sw_dtor _nvkm_engine_dtor | ||
| #define _nvkm_sw_init _nvkm_engine_init | ||
| #define _nvkm_sw_fini _nvkm_engine_fini | ||
|
|
||
| extern struct nvkm_oclass *nv04_sw_oclass; | ||
| extern struct nvkm_oclass *nv10_sw_oclass; | ||
| extern struct nvkm_oclass *nv50_sw_oclass; | ||
| extern struct nvkm_oclass *gf100_sw_oclass; | ||
|
|
||
| void nv04_sw_intr(struct nvkm_subdev *); | ||
| #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
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,4 +1,4 @@ | ||
| nvkm-y += nvkm/engine/sw/nv04.o | ||
| nvkm-y += nvkm/engine/sw/nv10.o | ||
| nvkm-y += nvkm/engine/sw/nv50.o | ||
| nvkm-y += nvkm/engine/sw/nvc0.o | ||
| nvkm-y += nvkm/engine/sw/gf100.o |
Oops, something went wrong.