diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-02-07 19:29:51 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-02 21:48:41 -0500 |
commit | 76b78b6fdcb0bbed72645aaa85de6013e2b135c3 (patch) | |
tree | def110f0c0b0928651186444a9dab058b510c5bb /drivers/gpu/nvgpu/gp106 | |
parent | f9b2c30b369ba13735e2c0168fd45bb7275bdebd (diff) |
gpu: nvgpu: Remove nvgpu_gpuid_t18x.h
Remove nvgpu_gpuid_t18x.h since this file is now visible. Migrate
the relevant definitions and defines into their expected places and
make the code use the real defines. No longer is hiding t18x specific
stuff necessary.
Bug 1799159
Change-Id: I47fa2392e46fdb7aacc70aeb0cc8c3f5ca0dc22f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1300976
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index a4dfd07f..37a3d152 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "gp106/pmu_gp106.h" | 31 | #include "gp106/pmu_gp106.h" |
32 | 32 | ||
33 | #include "sec2_gp106.h" | 33 | #include "sec2_gp106.h" |
34 | #include "nvgpu_gpuid_t18x.h" | ||
35 | 34 | ||
36 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | 35 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> |
37 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | 36 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c index 1f47cc5a..419c71df 100644 --- a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | |||
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
17 | #include "gr_ctx_gp106.h" | 17 | #include "gr_ctx_gp106.h" |
18 | #include "nvgpu_gpuid_t18x.h" | ||
19 | 18 | ||
20 | static int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) | 19 | static int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) |
21 | { | 20 | { |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index cece5dd6..d07223c9 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -52,8 +52,6 @@ | |||
52 | #include "gp106/fb_gp106.h" | 52 | #include "gp106/fb_gp106.h" |
53 | #include "gp106/gp106_gating_reglist.h" | 53 | #include "gp106/gp106_gating_reglist.h" |
54 | 54 | ||
55 | #include "nvgpu_gpuid_t18x.h" | ||
56 | |||
57 | #include <nvgpu/hw/gp106/hw_proj_gp106.h> | 55 | #include <nvgpu/hw/gp106/hw_proj_gp106.h> |
58 | 56 | ||
59 | static struct gpu_ops gp106_ops = { | 57 | static struct gpu_ops gp106_ops = { |