diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2018-09-19 02:16:27 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-25 03:20:25 -0400 |
commit | 421e64aad73c419495253c62b131677cf25c4924 (patch) | |
tree | 9489510265517a8cd8e9b86642fbd47d81cc2038 /drivers/gpu/nvgpu/common/pmu | |
parent | 032860d8de01ac3a3357a4758e7ee81bd418c48f (diff) |
gpu: nvgpu: move header location of gk20a.h
Update header path of gk20a.h in files present in common/
to <nvgpu/gk20a.h>
Jira NVGPU-597
Change-Id: I3431dae93ada9bd561454c89a0b99c5292ab4a8d
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1832024
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/pmu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_debug.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_pg.c | 3 |
6 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index ffc9ec39..fe36ab87 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c | |||
@@ -29,8 +29,7 @@ | |||
29 | #include <nvgpu/timers.h> | 29 | #include <nvgpu/timers.h> |
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
32 | 32 | #include <nvgpu/gk20a.h> | |
33 | #include "gk20a/gk20a.h" | ||
34 | 33 | ||
35 | static int nvgpu_pg_init_task(void *arg); | 34 | static int nvgpu_pg_init_task(void *arg); |
36 | 35 | ||
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c index 68a39432..11f972b8 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -25,10 +25,9 @@ | |||
25 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
26 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
27 | #include <nvgpu/dma.h> | 27 | #include <nvgpu/dma.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 29 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | ||
31 | |||
32 | void nvgpu_pmu_dump_elpg_stats(struct nvgpu_pmu *pmu) | 31 | void nvgpu_pmu_dump_elpg_stats(struct nvgpu_pmu *pmu) |
33 | { | 32 | { |
34 | struct gk20a *g = pmu->g; | 33 | struct gk20a *g = pmu->g; |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c index c1416493..21d03306 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #include <nvgpu/firmware.h> | 27 | #include <nvgpu/firmware.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/utils.h> | 29 | #include <nvgpu/utils.h> |
30 | 30 | #include <nvgpu/gk20a.h> | |
31 | #include "gk20a/gk20a.h" | ||
32 | 31 | ||
33 | #include "boardobj/boardobj.h" | 32 | #include "boardobj/boardobj.h" |
34 | #include "boardobj/boardobjgrp.h" | 33 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index 01b91662..6f1ca88a 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 28 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
29 | #include <nvgpu/falcon.h> | 29 | #include <nvgpu/falcon.h> |
30 | 30 | #include <nvgpu/gk20a.h> | |
31 | #include "gk20a/gk20a.h" | ||
32 | 31 | ||
33 | void nvgpu_pmu_seq_init(struct nvgpu_pmu *pmu) | 32 | void nvgpu_pmu_seq_init(struct nvgpu_pmu *pmu) |
34 | { | 33 | { |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c index 12ab4422..57a4ea40 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | |||
@@ -25,8 +25,7 @@ | |||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
28 | 28 | #include <nvgpu/gk20a.h> | |
29 | #include "gk20a/gk20a.h" | ||
30 | 29 | ||
31 | static u8 get_perfmon_id(struct nvgpu_pmu *pmu) | 30 | static u8 get_perfmon_id(struct nvgpu_pmu *pmu) |
32 | { | 31 | { |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index d2615b1a..3d46298d 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c | |||
@@ -26,8 +26,7 @@ | |||
26 | #include <nvgpu/barrier.h> | 26 | #include <nvgpu/barrier.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/utils.h> | 28 | #include <nvgpu/utils.h> |
29 | 29 | #include <nvgpu/gk20a.h> | |
30 | #include "gk20a/gk20a.h" | ||
31 | 30 | ||
32 | /* state transition : | 31 | /* state transition : |
33 | * OFF => [OFF_ON_PENDING optional] => ON_PENDING => ON => OFF | 32 | * OFF => [OFF_ON_PENDING optional] => ON_PENDING => ON => OFF |