From e37e527172e298eddbff78625b524f53ae0d3f96 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Fri, 25 May 2018 11:15:56 -0700 Subject: gpu: nvgpu: Fix include path for clockgating headers Removed the reference for $NVGPU/drivers/gpu/nvgpu/common from Makefile and fixed the include path for the clockgating headers in HAL files. Change-Id: I34c179866d28c932501b38184ec18d20dce81480 Signed-off-by: Vinod G Reviewed-on: https://git-master.nvidia.com/r/1730759 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 1 - drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 6b4fc505..1fc52d73 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -2,7 +2,6 @@ GCOV_PROFILE := y ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu/include ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu -ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu/common ccflags-y += -I$(srctree.nvgpu)/include ccflags-y += -I$(srctree.nvgpu)/include/uapi ccflags-y += -I$(srctree.nvgpu-next)/drivers/gpu/nvgpu diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 3ac1d79b..3c3ad0fb 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -23,6 +23,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gp106_gating_reglist.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -79,7 +80,6 @@ #include "gp106/gr_ctx_gp106.h" #include "gp106/gr_gp106.h" #include "gp106/fb_gp106.h" -#include "clock_gating/gp106_gating_reglist.h" #include "gp106/flcn_gp106.h" #include "gp106/fuse_gp106.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a6ddc27f..2d6479fc 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -23,6 +23,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gp10b_gating_reglist.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -49,7 +50,6 @@ #include "gp10b/pmu_gp10b.h" #include "gp10b/gr_ctx_gp10b.h" #include "gp10b/fifo_gp10b.h" -#include "clock_gating/gp10b_gating_reglist.h" #include "gp10b/regops_gp10b.h" #include "gp10b/therm_gp10b.h" #include "gp10b/priv_ring_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index a3ad7051..9b38f881 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -23,6 +23,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gv100_gating_reglist.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -98,7 +99,6 @@ #include "gv100/pmu_gv100.h" #include "gv100/nvlink_gv100.h" #include "gv100/regops_gv100.h" -#include "clock_gating/gv100_gating_reglist.h" #include #include diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index a47b3ce6..2379c17b 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -23,6 +23,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gv11b_gating_reglist.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -77,7 +78,6 @@ #include "acr_gv11b.h" #include "fb_gv11b.h" #include "fifo_gv11b.h" -#include "clock_gating/gv11b_gating_reglist.h" #include "regops_gv11b.h" #include "subctx_gv11b.h" #include "therm_gv11b.h" diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 1ed576f9..3f6d4e0f 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -21,6 +21,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gp10b_gating_reglist.h" #include "vgpu/fifo_vgpu.h" #include "vgpu/gr_vgpu.h" @@ -51,7 +52,6 @@ #include "gp10b/gr_gp10b.h" #include "gp10b/gr_ctx_gp10b.h" #include "gp10b/fifo_gp10b.h" -#include "clock_gating/gp10b_gating_reglist.h" #include "gp10b/regops_gp10b.h" #include "gp10b/therm_gp10b.h" #include "gp10b/priv_ring_gp10b.h" diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 3a4af601..e0142405 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c @@ -21,6 +21,7 @@ */ #include "common/bus/bus_gk20a.h" +#include "common/clock_gating/gv11b_gating_reglist.h" #include #include @@ -76,7 +77,6 @@ #include #include #include -#include #include #include -- cgit v1.2.2