diff options
Diffstat (limited to 'drivers/gpu/nvgpu/clk')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_arb.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_common.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_mclk.c | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 15439817..4400f3bb 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -26,10 +26,15 @@ | |||
26 | #include <nvgpu/atomic.h> | 26 | #include <nvgpu/atomic.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/kref.h> | 28 | #include <nvgpu/kref.h> |
29 | #include <nvgpu/log.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "clk/clk_arb.h" | 32 | #include "clk/clk_arb.h" |
32 | 33 | ||
34 | #ifdef CONFIG_DEBUG_FS | ||
35 | #include "gk20a/platform_gk20a.h" | ||
36 | #endif | ||
37 | |||
33 | #define MAX_F_POINTS 256 | 38 | #define MAX_F_POINTS 256 |
34 | #define DEFAULT_EVENT_NUMBER 32 | 39 | #define DEFAULT_EVENT_NUMBER 32 |
35 | 40 | ||
@@ -1482,8 +1487,7 @@ static long nvgpu_clk_arb_ioctl_event_dev(struct file *filp, unsigned int cmd, | |||
1482 | (struct nvgpu_gpu_set_event_filter_args *)buf); | 1487 | (struct nvgpu_gpu_set_event_filter_args *)buf); |
1483 | break; | 1488 | break; |
1484 | default: | 1489 | default: |
1485 | dev_dbg(dev_from_gk20a(g), | 1490 | nvgpu_warn(g, "unrecognized event ioctl cmd: 0x%x", cmd); |
1486 | "unrecognized event ioctl cmd: 0x%x", cmd); | ||
1487 | err = -ENOTTY; | 1491 | err = -ENOTTY; |
1488 | } | 1492 | } |
1489 | 1493 | ||
diff --git a/drivers/gpu/nvgpu/clk/clk_common.c b/drivers/gpu/nvgpu/clk/clk_common.c index 3230ded0..0704ba2b 100644 --- a/drivers/gpu/nvgpu/clk/clk_common.c +++ b/drivers/gpu/nvgpu/clk/clk_common.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | 18 | ||
19 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/platform_gk20a.h" | ||
20 | 21 | ||
21 | struct clk *gk20a_clk_get(struct gk20a *g) | 22 | struct clk *gk20a_clk_get(struct gk20a *g) |
22 | { | 23 | { |
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index cf04c98c..3996c0e1 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c | |||
@@ -18,6 +18,9 @@ | |||
18 | 18 | ||
19 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/pmu_gk20a.h" | 20 | #include "gk20a/pmu_gk20a.h" |
21 | #ifdef CONFIG_DEBUG_FS | ||
22 | #include "gk20a/platform_gk20a.h" | ||
23 | #endif | ||
21 | 24 | ||
22 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | 25 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> |
23 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | 26 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |