diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 0fc39bf4..764ffe1a 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -22,9 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/dma-mapping.h> | ||
26 | #include <linux/dma-buf.h> | ||
27 | |||
28 | #include <nvgpu/bitops.h> | 25 | #include <nvgpu/bitops.h> |
29 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
30 | #include <nvgpu/lock.h> | 27 | #include <nvgpu/lock.h> |
@@ -61,14 +58,14 @@ | |||
61 | #define CSS_MAX_PERFMON_IDS 256 | 58 | #define CSS_MAX_PERFMON_IDS 256 |
62 | 59 | ||
63 | /* reports whether the hw queue overflowed */ | 60 | /* reports whether the hw queue overflowed */ |
64 | static inline bool css_hw_get_overflow_status(struct gk20a *g) | 61 | bool css_hw_get_overflow_status(struct gk20a *g) |
65 | { | 62 | { |
66 | const u32 st = perf_pmasys_control_membuf_status_overflowed_f(); | 63 | const u32 st = perf_pmasys_control_membuf_status_overflowed_f(); |
67 | return st == (gk20a_readl(g, perf_pmasys_control_r()) & st); | 64 | return st == (gk20a_readl(g, perf_pmasys_control_r()) & st); |
68 | } | 65 | } |
69 | 66 | ||
70 | /* returns how many pending snapshot entries are pending */ | 67 | /* returns how many pending snapshot entries are pending */ |
71 | static inline u32 css_hw_get_pending_snapshots(struct gk20a *g) | 68 | u32 css_hw_get_pending_snapshots(struct gk20a *g) |
72 | { | 69 | { |
73 | return gk20a_readl(g, perf_pmasys_mem_bytes_r()) / | 70 | return gk20a_readl(g, perf_pmasys_mem_bytes_r()) / |
74 | sizeof(struct gk20a_cs_snapshot_fifo_entry); | 71 | sizeof(struct gk20a_cs_snapshot_fifo_entry); |
@@ -245,7 +242,7 @@ static void css_gr_free_shared_data(struct gr_gk20a *gr) | |||
245 | } | 242 | } |
246 | 243 | ||
247 | 244 | ||
248 | static struct gk20a_cs_snapshot_client* | 245 | struct gk20a_cs_snapshot_client* |
249 | css_gr_search_client(struct nvgpu_list_node *clients, u32 perfmon) | 246 | css_gr_search_client(struct nvgpu_list_node *clients, u32 perfmon) |
250 | { | 247 | { |
251 | struct gk20a_cs_snapshot_client *client; | 248 | struct gk20a_cs_snapshot_client *client; |