gpu: nvgpu: create nvgpu.common.hal.clk

Create unit nvgpu.common.hal.clk in by moving clk_*.[ch] files to
hal/clk path. Also update makefiles and include files to match.

JIRA NVGPU-2020

Change-Id: Ied217cfac2b000a2d22eda582d6030d0479b1310
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2101400
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Philip Elcan
2019-04-19 15:08:16 -04:00
committed by mobile promotions
parent 4ffad99a16
commit edaddb9bb2
14 changed files with 12 additions and 12 deletions

View File

@@ -166,6 +166,8 @@ nvgpu-y += \
hal/class/class_gp10b.o \ hal/class/class_gp10b.o \
hal/class/class_gv11b.o \ hal/class/class_gv11b.o \
hal/class/class_tu104.o \ hal/class/class_tu104.o \
hal/clk/clk_gm20b.o \
hal/clk/clk_gv100.o \
hal/gr/ecc/ecc_gp10b.o \ hal/gr/ecc/ecc_gp10b.o \
hal/gr/ecc/ecc_gv11b.o \ hal/gr/ecc/ecc_gv11b.o \
hal/gr/ecc/ecc_tu104.o \ hal/gr/ecc/ecc_tu104.o \
@@ -507,7 +509,6 @@ nvgpu-y += \
gk20a/gr_gk20a.o \ gk20a/gr_gk20a.o \
gk20a/mm_gk20a.o \ gk20a/mm_gk20a.o \
gm20b/gr_gm20b.o \ gm20b/gr_gm20b.o \
gm20b/clk_gm20b.o \
gm20b/mm_gm20b.o gm20b/mm_gm20b.o
nvgpu-$(CONFIG_GK20A_VIDMEM) += \ nvgpu-$(CONFIG_GK20A_VIDMEM) += \
@@ -562,7 +563,6 @@ nvgpu-y += \
gv100/bios_gv100.o \ gv100/bios_gv100.o \
gv100/fifo_gv100.o \ gv100/fifo_gv100.o \
gv100/gr_gv100.o \ gv100/gr_gv100.o \
gv100/clk_gv100.o \
tu104/mm_tu104.o \ tu104/mm_tu104.o \
tu104/fifo_tu104.o \ tu104/fifo_tu104.o \
tu104/gr_tu104.o \ tu104/gr_tu104.o \

View File

@@ -244,7 +244,6 @@ srcs += common/sim/sim.c \
gk20a/gr_gk20a.c \ gk20a/gr_gk20a.c \
gk20a/mm_gk20a.c \ gk20a/mm_gk20a.c \
gm20b/gr_gm20b.c \ gm20b/gr_gm20b.c \
gm20b/clk_gm20b.c \
gm20b/mm_gm20b.c \ gm20b/mm_gm20b.c \
gp10b/gr_gp10b.c \ gp10b/gr_gp10b.c \
gp10b/mm_gp10b.c \ gp10b/mm_gp10b.c \
@@ -256,7 +255,6 @@ srcs += common/sim/sim.c \
gv100/bios_gv100.c \ gv100/bios_gv100.c \
gv100/fifo_gv100.c \ gv100/fifo_gv100.c \
gv100/gr_gv100.c \ gv100/gr_gv100.c \
gv100/clk_gv100.c \
tu104/bios_tu104.c \ tu104/bios_tu104.c \
tu104/fbpa_tu104.c \ tu104/fbpa_tu104.c \
tu104/fifo_tu104.c \ tu104/fifo_tu104.c \
@@ -279,6 +277,8 @@ srcs += common/sim/sim.c \
hal/class/class_gp10b.c \ hal/class/class_gp10b.c \
hal/class/class_gv11b.c \ hal/class/class_gv11b.c \
hal/class/class_tu104.c \ hal/class/class_tu104.c \
hal/clk/clk_gm20b.c \
hal/clk/clk_gv100.c \
hal/gr/ecc/ecc_gp10b.c \ hal/gr/ecc/ecc_gp10b.c \
hal/gr/ecc/ecc_gv11b.c \ hal/gr/ecc/ecc_gv11b.c \
hal/gr/ecc/ecc_tu104.c \ hal/gr/ecc/ecc_tu104.c \

View File

@@ -85,6 +85,7 @@
#include "hal/falcon/falcon_gk20a.h" #include "hal/falcon/falcon_gk20a.h"
#include "hal/perf/perf_gm20b.h" #include "hal/perf/perf_gm20b.h"
#include "hal/netlist/netlist_gm20b.h" #include "hal/netlist/netlist_gm20b.h"
#include "hal/clk/clk_gm20b.h"
#include "common/top/top_gm20b.h" #include "common/top/top_gm20b.h"
#include "common/sync/syncpt_cmdbuf_gk20a.h" #include "common/sync/syncpt_cmdbuf_gk20a.h"
@@ -95,7 +96,6 @@
#include "gm20b/gr_gm20b.h" #include "gm20b/gr_gm20b.h"
#include "gm20b/mm_gm20b.h" #include "gm20b/mm_gm20b.h"
#include "gm20b/clk_gm20b.h"
#include "hal_gm20b.h" #include "hal_gm20b.h"
#include <nvgpu/hw/gm20b/hw_proj_gm20b.h> #include <nvgpu/hw/gm20b/hw_proj_gm20b.h>

View File

@@ -148,7 +148,7 @@
#include "gv100/fifo_gv100.h" #include "gv100/fifo_gv100.h"
#include "gv100/gr_gv100.h" #include "gv100/gr_gv100.h"
#include "gv100/mm_gv100.h" #include "gv100/mm_gv100.h"
#include "gv100/clk_gv100.h" #include "hal/clk/clk_gv100.h"
#include <nvgpu/ptimer.h> #include <nvgpu/ptimer.h>
#include <nvgpu/class.h> #include <nvgpu/class.h>

View File

@@ -147,7 +147,7 @@
#include "gm20b/gr_gm20b.h" #include "gm20b/gr_gm20b.h"
#include "gm20b/mm_gm20b.h" #include "gm20b/mm_gm20b.h"
#include "gv100/clk_gv100.h" #include "hal/clk/clk_gv100.h"
#include "gp10b/gr_gp10b.h" #include "gp10b/gr_gp10b.h"

View File

@@ -108,7 +108,7 @@ typedef void (*global_ctx_mem_destroy_fn)(struct gk20a *g,
#include <nvgpu/ltc.h> #include <nvgpu/ltc.h>
#include <nvgpu/nvgpu_err.h> #include <nvgpu/nvgpu_err.h>
#include "gk20a/clk_gk20a.h" #include "hal/clk/clk_gk20a.h"
#include "gk20a/fifo_gk20a.h" #include "gk20a/fifo_gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017-2018 NVIDIA Corporation. All rights reserved. * Copyright (C) 2017-2019 NVIDIA Corporation. All rights reserved.
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and * License version 2, as published by the Free Software Foundation, and
@@ -19,7 +19,7 @@
#include <nvgpu/io.h> #include <nvgpu/io.h>
#include <nvgpu/clk_arb.h> #include <nvgpu/clk_arb.h>
#include "gm20b/clk_gm20b.h" #include "hal/clk/clk_gm20b.h"
#include "os_linux.h" #include "os_linux.h"
#include "platform_gk20a.h" #include "platform_gk20a.h"

View File

@@ -28,7 +28,7 @@
#include <nvgpu/pmu/clk/clk_fll.h> #include <nvgpu/pmu/clk/clk_fll.h>
#include <nvgpu/pmu/clk/clk.h> #include <nvgpu/pmu/clk/clk.h>
#include "gv100/clk_gv100.h" #include "hal/clk/clk_gv100.h"
#include "common/pmu/clk/clk_freq_controller.h" #include "common/pmu/clk/clk_freq_controller.h"
void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock); void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock);

View File

@@ -47,7 +47,7 @@
#include <nvgpu/pmu/pmu_perfmon.h> #include <nvgpu/pmu/pmu_perfmon.h>
#include <nvgpu/linux/dma.h> #include <nvgpu/linux/dma.h>
#include "gm20b/clk_gm20b.h" #include "hal/clk/clk_gm20b.h"
#include "scale.h" #include "scale.h"
#include "platform_gk20a.h" #include "platform_gk20a.h"