From 8b3d94ffd3e5b6d7a622c6ad54692d79bf39d1ce Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 19 Apr 2017 14:09:05 -0700 Subject: gpu: nvgpu: Move sysfs dependencies from HAL to Linux Move sysfs dependencies from gk20a/ and gp10b/ to common/linux. At the same time the gk20a and gp10b variants are merged into one. JIRA NVGPU-48 Change-Id: I212be8f1beb8d20a57de04a57513e8fa0e2e83b4 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master/r/1466055 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gp10b/gr_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 3bddef4c..f27e2605 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c @@ -31,7 +31,6 @@ #include "gm20b/gr_gm20b.h" #include "gp10b/gr_gp10b.h" -#include "gp10b_sysfs.h" #include #include @@ -2292,6 +2291,8 @@ static int gr_gp10b_init_preemption_state(struct gk20a *g) gr_debug_2_gfxp_wfi_always_injects_wfi_enabled_f()); gk20a_writel(g, gr_debug_2_r(), debug_2); + g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v(); + return 0; } -- cgit v1.2.2