diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-08-26 13:18:16 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:49 -0500 |
commit | 3bccca16b88a9629ef4ae72c0b9314761ab033ca (patch) | |
tree | abeada88898210306cec00a39ff091b22e1cc31e /drivers/gpu/nvgpu/gp106/hal_gp106.c | |
parent | d2b67f1ad606733a63d8261e36068e5bd1f96cdc (diff) |
gpu: nvgpu: gp106: Skip resetting FB
FB is enabled in devinit. Skip resetting it in GPU boot.
Bug 1799537
Change-Id: I0748127f0962e7d6d2bf0ecece6773fdf9c35bc8
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1208715
(cherry picked from commit ceafac52f5711bd987b746686f11b22807f74698)
Reviewed-on: http://git-master/r/1227265
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/hal_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 6c8ac7bc..5f15a2c8 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "gp106/ltc_gp106.h" | 25 | #include "gp106/ltc_gp106.h" |
26 | #include "gp10b/mm_gp10b.h" | 26 | #include "gp10b/mm_gp10b.h" |
27 | #include "gp10b/ce_gp10b.h" | 27 | #include "gp10b/ce_gp10b.h" |
28 | #include "gp10b/fb_gp10b.h" | ||
29 | #include "gp106/fifo_gp106.h" | 28 | #include "gp106/fifo_gp106.h" |
30 | #include "gp10b/gp10b_gating_reglist.h" | 29 | #include "gp10b/gp10b_gating_reglist.h" |
31 | #include "gp10b/regops_gp10b.h" | 30 | #include "gp10b/regops_gp10b.h" |
@@ -43,6 +42,7 @@ | |||
43 | #include "gp106/pmu_gp106.h" | 42 | #include "gp106/pmu_gp106.h" |
44 | #include "gp106/gr_ctx_gp106.h" | 43 | #include "gp106/gr_ctx_gp106.h" |
45 | #include "gp106/gr_gp106.h" | 44 | #include "gp106/gr_gp106.h" |
45 | #include "gp106/fb_gp106.h" | ||
46 | #include "nvgpu_gpuid_t18x.h" | 46 | #include "nvgpu_gpuid_t18x.h" |
47 | #include "hw_proj_gp106.h" | 47 | #include "hw_proj_gp106.h" |
48 | #include "gk20a/dbg_gpu_gk20a.h" | 48 | #include "gk20a/dbg_gpu_gk20a.h" |
@@ -148,7 +148,7 @@ int gp106_init_hal(struct gk20a *g) | |||
148 | gp10b_init_mc(gops); | 148 | gp10b_init_mc(gops); |
149 | gp106_init_gr(gops); | 149 | gp106_init_gr(gops); |
150 | gp106_init_ltc(gops); | 150 | gp106_init_ltc(gops); |
151 | gp10b_init_fb(gops); | 151 | gp106_init_fb(gops); |
152 | gp106_init_fifo(gops); | 152 | gp106_init_fifo(gops); |
153 | gp10b_init_ce(gops); | 153 | gp10b_init_ce(gops); |
154 | gp106_init_gr_ctx(gops); | 154 | gp106_init_gr_ctx(gops); |