diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-24 14:42:18 +0900 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-02-25 13:22:10 +1000 |
| commit | 8d756e1e1c8c2b7aa7f0602e6e26291f849860fe (patch) | |
| tree | 40b67fb53cf2e9fa8180253166f87cfd397206d8 | |
| parent | e1cd07022582d123ff47067107a08a7a5dc6717e (diff) | |
| download | nouveau-8d756e1e1c8c2b7aa7f0602e6e26291f849860fe.tar.gz | |
gr/gk20a: share external bundles loading functions
There functions are going to be used by other chips that rely on
NVIDIA-provided firmware. Export them.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gf100.h | 8 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gk20a.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/gf100.h b/drm/nouveau/nvkm/engine/gr/gf100.h index cff4b40d8..ea8d2831f 100644 --- a/drm/nouveau/nvkm/engine/gr/gf100.h +++ b/drm/nouveau/nvkm/engine/gr/gf100.h @@ -203,6 +203,14 @@ void gf100_gr_icmd(struct gf100_gr *, const struct gf100_gr_pack *); void gf100_gr_mthd(struct gf100_gr *, const struct gf100_gr_pack *); int gf100_gr_init_ctxctl(struct gf100_gr *); +/* external bundles loading functions */ +int gk20a_gr_av_to_init(struct gf100_gr *, const char *, + struct gf100_gr_pack **); +int gk20a_gr_aiv_to_init(struct gf100_gr *, const char *, + struct gf100_gr_pack **); +int gk20a_gr_av_to_method(struct gf100_gr *, const char *, + struct gf100_gr_pack **); + /* register init value lists */ extern const struct gf100_gr_init gf100_gr_init_main_0[]; diff --git a/drm/nouveau/nvkm/engine/gr/gk20a.c b/drm/nouveau/nvkm/engine/gr/gk20a.c index 66720aba2..297a4d2ed 100644 --- a/drm/nouveau/nvkm/engine/gr/gk20a.c +++ b/drm/nouveau/nvkm/engine/gr/gk20a.c @@ -32,7 +32,7 @@ struct gk20a_fw_av u32 data; }; -static int +int gk20a_gr_av_to_init(struct gf100_gr *gr, const char *fw_name, struct gf100_gr_pack **ppack) { @@ -81,7 +81,7 @@ struct gk20a_fw_aiv u32 data; }; -static int +int gk20a_gr_aiv_to_init(struct gf100_gr *gr, const char *fw_name, struct gf100_gr_pack **ppack) { @@ -123,7 +123,7 @@ end: return ret; } -static int +int gk20a_gr_av_to_method(struct gf100_gr *gr, const char *fw_name, struct gf100_gr_pack **ppack) { |