-
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/mpeg: 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
e3c71eb
commit e7c2968
Showing
9 changed files
with
237 additions
and
273 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,62 @@ | ||
| #ifndef __NOUVEAU_MPEG_H__ | ||
| #define __NOUVEAU_MPEG_H__ | ||
|
|
||
| #include <core/engine.h> | ||
| #ifndef __NVKM_MPEG_H__ | ||
| #define __NVKM_MPEG_H__ | ||
| #include <core/engctx.h> | ||
|
|
||
| struct nouveau_mpeg_chan { | ||
| struct nouveau_engctx base; | ||
| struct nvkm_mpeg_chan { | ||
| struct nvkm_engctx base; | ||
| }; | ||
|
|
||
| #define nouveau_mpeg_context_create(p,e,c,g,s,a,f,d) \ | ||
| nouveau_engctx_create((p), (e), (c), (g), (s), (a), (f), (d)) | ||
| #define nouveau_mpeg_context_destroy(d) \ | ||
| nouveau_engctx_destroy(&(d)->base) | ||
| #define nouveau_mpeg_context_init(d) \ | ||
| nouveau_engctx_init(&(d)->base) | ||
| #define nouveau_mpeg_context_fini(d,s) \ | ||
| nouveau_engctx_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nouveau_mpeg_context_dtor _nouveau_engctx_dtor | ||
| #define _nouveau_mpeg_context_init _nouveau_engctx_init | ||
| #define _nouveau_mpeg_context_fini _nouveau_engctx_fini | ||
| #define _nouveau_mpeg_context_rd32 _nouveau_engctx_rd32 | ||
| #define _nouveau_mpeg_context_wr32 _nouveau_engctx_wr32 | ||
|
|
||
| struct nouveau_mpeg { | ||
| struct nouveau_engine base; | ||
| }; | ||
| #define nvkm_mpeg_context_create(p,e,c,g,s,a,f,d) \ | ||
| nvkm_engctx_create((p), (e), (c), (g), (s), (a), (f), (d)) | ||
| #define nvkm_mpeg_context_destroy(d) \ | ||
| nvkm_engctx_destroy(&(d)->base) | ||
| #define nvkm_mpeg_context_init(d) \ | ||
| nvkm_engctx_init(&(d)->base) | ||
| #define nvkm_mpeg_context_fini(d,s) \ | ||
| nvkm_engctx_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nvkm_mpeg_context_dtor _nvkm_engctx_dtor | ||
| #define _nvkm_mpeg_context_init _nvkm_engctx_init | ||
| #define _nvkm_mpeg_context_fini _nvkm_engctx_fini | ||
| #define _nvkm_mpeg_context_rd32 _nvkm_engctx_rd32 | ||
| #define _nvkm_mpeg_context_wr32 _nvkm_engctx_wr32 | ||
|
|
||
| #define nouveau_mpeg_create(p,e,c,d) \ | ||
| nouveau_engine_create((p), (e), (c), true, "PMPEG", "mpeg", (d)) | ||
| #define nouveau_mpeg_destroy(d) \ | ||
| nouveau_engine_destroy(&(d)->base) | ||
| #define nouveau_mpeg_init(d) \ | ||
| nouveau_engine_init(&(d)->base) | ||
| #define nouveau_mpeg_fini(d,s) \ | ||
| nouveau_engine_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nouveau_mpeg_dtor _nouveau_engine_dtor | ||
| #define _nouveau_mpeg_init _nouveau_engine_init | ||
| #define _nouveau_mpeg_fini _nouveau_engine_fini | ||
|
|
||
| extern struct nouveau_oclass nv31_mpeg_oclass; | ||
| extern struct nouveau_oclass nv40_mpeg_oclass; | ||
| extern struct nouveau_oclass nv44_mpeg_oclass; | ||
| extern struct nouveau_oclass nv50_mpeg_oclass; | ||
| extern struct nouveau_oclass nv84_mpeg_oclass; | ||
| extern struct nouveau_ofuncs nv31_mpeg_ofuncs; | ||
| extern struct nouveau_oclass nv31_mpeg_cclass; | ||
| extern struct nouveau_oclass nv31_mpeg_sclass[]; | ||
| extern struct nouveau_oclass nv40_mpeg_sclass[]; | ||
| void nv31_mpeg_intr(struct nouveau_subdev *); | ||
| void nv31_mpeg_tile_prog(struct nouveau_engine *, int); | ||
| int nv31_mpeg_init(struct nouveau_object *); | ||
|
|
||
| extern struct nouveau_ofuncs nv50_mpeg_ofuncs; | ||
| int nv50_mpeg_context_ctor(struct nouveau_object *, struct nouveau_object *, | ||
| struct nouveau_oclass *, void *, u32, | ||
| struct nouveau_object **); | ||
| void nv50_mpeg_intr(struct nouveau_subdev *); | ||
| int nv50_mpeg_init(struct nouveau_object *); | ||
| #include <core/engine.h> | ||
|
|
||
| struct nvkm_mpeg { | ||
| struct nvkm_engine base; | ||
| }; | ||
|
|
||
| #define nvkm_mpeg_create(p,e,c,d) \ | ||
| nvkm_engine_create((p), (e), (c), true, "PMPEG", "mpeg", (d)) | ||
| #define nvkm_mpeg_destroy(d) \ | ||
| nvkm_engine_destroy(&(d)->base) | ||
| #define nvkm_mpeg_init(d) \ | ||
| nvkm_engine_init(&(d)->base) | ||
| #define nvkm_mpeg_fini(d,s) \ | ||
| nvkm_engine_fini(&(d)->base, (s)) | ||
|
|
||
| #define _nvkm_mpeg_dtor _nvkm_engine_dtor | ||
| #define _nvkm_mpeg_init _nvkm_engine_init | ||
| #define _nvkm_mpeg_fini _nvkm_engine_fini | ||
|
|
||
| extern struct nvkm_oclass nv31_mpeg_oclass; | ||
| extern struct nvkm_oclass nv40_mpeg_oclass; | ||
| extern struct nvkm_oclass nv44_mpeg_oclass; | ||
| extern struct nvkm_oclass nv50_mpeg_oclass; | ||
| extern struct nvkm_oclass g84_mpeg_oclass; | ||
| extern struct nvkm_ofuncs nv31_mpeg_ofuncs; | ||
| extern struct nvkm_oclass nv31_mpeg_cclass; | ||
| extern struct nvkm_oclass nv31_mpeg_sclass[]; | ||
| extern struct nvkm_oclass nv40_mpeg_sclass[]; | ||
| void nv31_mpeg_intr(struct nvkm_subdev *); | ||
| void nv31_mpeg_tile_prog(struct nvkm_engine *, int); | ||
| int nv31_mpeg_init(struct nvkm_object *); | ||
|
|
||
| extern struct nvkm_ofuncs nv50_mpeg_ofuncs; | ||
| int nv50_mpeg_context_ctor(struct nvkm_object *, struct nvkm_object *, | ||
| struct nvkm_oclass *, void *, u32, | ||
| struct nvkm_object **); | ||
| void nv50_mpeg_intr(struct nvkm_subdev *); | ||
| int nv50_mpeg_init(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
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.