diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index e140589a..7a439c10 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -8,6 +8,7 @@ ccflags-y += -I../kernel-nvgpu/include/uapi | |||
8 | ccflags-y += -Wno-multichar | 8 | ccflags-y += -Wno-multichar |
9 | ccflags-y += -Werror | 9 | ccflags-y += -Werror |
10 | ccflags-y += -Wno-error=cpp | 10 | ccflags-y += -Wno-error=cpp |
11 | ccflags-y += -Wno-duplicate-decl-specifier | ||
11 | 12 | ||
12 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | 13 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) |
13 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t18x/drivers/gpu/nvgpu | 14 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t18x/drivers/gpu/nvgpu |
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c index 6744699f..77e93458 100644 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | |||
@@ -70,11 +70,6 @@ static inline int ring_len(struct nvgpu_ctxsw_ring_header *hdr) | |||
70 | return (hdr->write_idx - hdr->read_idx) % hdr->num_ents; | 70 | return (hdr->write_idx - hdr->read_idx) % hdr->num_ents; |
71 | } | 71 | } |
72 | 72 | ||
73 | static inline int ring_space(struct nvgpu_ctxsw_ring_header *hdr) | ||
74 | { | ||
75 | return (hdr->read_idx - hdr->write_idx - 1) % hdr->num_ents; | ||
76 | } | ||
77 | |||
78 | ssize_t gk20a_ctxsw_dev_read(struct file *filp, char __user *buf, size_t size, | 73 | ssize_t gk20a_ctxsw_dev_read(struct file *filp, char __user *buf, size_t size, |
79 | loff_t *off) | 74 | loff_t *off) |
80 | { | 75 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 60247da8..a5caf048 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -1203,15 +1203,18 @@ static int gr_gk20a_setup_alpha_beta_tables(struct gk20a *g, | |||
1203 | u32 reg_offset; | 1203 | u32 reg_offset; |
1204 | bool assign_alpha; | 1204 | bool assign_alpha; |
1205 | 1205 | ||
1206 | u32 map_alpha[gr_pd_alpha_ratio_table__size_1_v()]; | 1206 | u32 *map_alpha; |
1207 | u32 map_beta[gr_pd_alpha_ratio_table__size_1_v()]; | 1207 | u32 *map_beta; |
1208 | u32 map_reg_used[gr_pd_alpha_ratio_table__size_1_v()]; | 1208 | u32 *map_reg_used; |
1209 | 1209 | ||
1210 | gk20a_dbg_fn(""); | 1210 | gk20a_dbg_fn(""); |
1211 | 1211 | ||
1212 | memset(map_alpha, 0, gr_pd_alpha_ratio_table__size_1_v() * sizeof(u32)); | 1212 | map_alpha = kzalloc(3 * gr_pd_alpha_ratio_table__size_1_v() * |
1213 | memset(map_beta, 0, gr_pd_alpha_ratio_table__size_1_v() * sizeof(u32)); | 1213 | sizeof(u32), GFP_KERNEL); |
1214 | memset(map_reg_used, 0, gr_pd_alpha_ratio_table__size_1_v() * sizeof(u32)); | 1214 | if (!map_alpha) |
1215 | return -ENOMEM; | ||
1216 | map_beta = map_alpha + gr_pd_alpha_ratio_table__size_1_v(); | ||
1217 | map_reg_used = map_beta + gr_pd_alpha_ratio_table__size_1_v(); | ||
1215 | 1218 | ||
1216 | for (row = 0; row < rows; ++row) { | 1219 | for (row = 0; row < rows; ++row) { |
1217 | alpha_target = max_t(u32, gr->tpc_count * row / rows, 1); | 1220 | alpha_target = max_t(u32, gr->tpc_count * row / rows, 1); |
@@ -1277,6 +1280,7 @@ static int gr_gk20a_setup_alpha_beta_tables(struct gk20a *g, | |||
1277 | } | 1280 | } |
1278 | } | 1281 | } |
1279 | 1282 | ||
1283 | kfree(map_alpha); | ||
1280 | return 0; | 1284 | return 0; |
1281 | } | 1285 | } |
1282 | 1286 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c index abe6771c..ca36d481 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | |||
@@ -52,12 +52,12 @@ struct gk20a_emc_params { | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); | 54 | static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE); |
55 | static inline u32 pmc_read(unsigned long reg) | 55 | static inline u32 __maybe_unused pmc_read(unsigned long reg) |
56 | { | 56 | { |
57 | return readl(pmc + reg); | 57 | return readl(pmc + reg); |
58 | } | 58 | } |
59 | 59 | ||
60 | static inline void pmc_write(u32 val, unsigned long reg) | 60 | static inline void __maybe_unused pmc_write(u32 val, unsigned long reg) |
61 | { | 61 | { |
62 | writel_relaxed(val, pmc + reg); | 62 | writel_relaxed(val, pmc + reg); |
63 | } | 63 | } |