diff options
| author | Xia Yang <xiay@nvidia.com> | 2015-12-07 16:37:08 -0800 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-01-15 14:32:53 +0900 |
| commit | 35d84b3b3cc604ec4ba1ab1f81a1f050ea2f5c20 (patch) | |
| tree | c1716e02add13f0c57515bddbb87ffeaf9b66c75 /drm/nouveau/nvkm/engine/gr/gf100.h | |
| parent | 038fae29d683b5b3f5f539d793c8dc4e85325dd3 (diff) | |
| download | nouveau-35d84b3b3cc604ec4ba1ab1f81a1f050ea2f5c20.tar.gz | |
gr: rename gf100_gr_wait_idle for gk104_*
The status bit used in gf100_gr_wait_idle only exists starting gk104.
As the function is currently used in gk20a and later, rename the function
to use gk104 prefix to reflex correct supported chip version.
Signed-off-by: Xia Yang <xiay@nvidia.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/gr/gf100.h')
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gf100.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/gf100.h b/drm/nouveau/nvkm/engine/gr/gf100.h index 02e78b8d9..f42ac4650 100644 --- a/drm/nouveau/nvkm/engine/gr/gf100.h +++ b/drm/nouveau/nvkm/engine/gr/gf100.h @@ -198,12 +198,13 @@ extern struct gf100_gr_ucode gf100_gr_gpccs_ucode; extern struct gf100_gr_ucode gk110_gr_fecs_ucode; extern struct gf100_gr_ucode gk110_gr_gpccs_ucode; -int gf100_gr_wait_idle(struct gf100_gr *); void gf100_gr_mmio(struct gf100_gr *, const struct gf100_gr_pack *); 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 *); +int gk104_gr_wait_idle(struct gf100_gr *); + /* register init value lists */ extern const struct gf100_gr_init gf100_gr_init_main_0[]; |