summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorDebarshi Dutta <ddutta@nvidia.com>2018-09-04 01:25:33 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-20 13:50:12 -0400
commit519948a9c664020fd0b37118749faad2dfd73d97 (patch)
tree1eb57dc393075670331ca89cf366a093d75d3f47 /drivers/gpu/nvgpu/include
parent1c7258411da89aea5279e9a8d117479928f8bf64 (diff)
gpu: nvgpu: add igpu support for clk_arbiter.
This patch constructs clk_arbiter specific code for gp10b as well as gv11b and does the necessary plumbing in the clk_arbiter code. The changes made are as follows. 1) Constructed clk_arb_gp10b.* files which add support for clk_arb related HALS including the nvgpu_clk_arb_init and nvgpu_clk_arb_cb. This doesn't have support for debugfs nor the VFUpdateEvent yet and consequently no support for arb->notifications. 2) Added gpcclk specific variables corresponding to every gpc2clk in a given clk_arb related struct. 3) Linux specific support_clk_freq_controller is assigned true in platform_gp10b.c and platform_gv11b.c files. 4) Incremented the clk_arb_worker.put atomic variable during worker_deinit so as to allow the worker thread to be stopped. 5) Added the flag clk_arb_events_supported as part of struct nvgpu_clk_arb. This flag is used to selectively account for the extra refcounting present in OS specific code i.e. nvgpu_clk_arb_commit_request_fd. For igpus, the extra refcount is reduced during nvgpu_clk_arb_release_completion_dev. Bug 2061372 Change-Id: Id00acb106db2b46e55aa0324034a16a73723c078 Signed-off-by: Debarshi Dutta <ddutta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1774281 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/clk_arb.h2
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/gk20a.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
index 46952f1c..81b1df1b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
@@ -217,6 +217,8 @@ struct nvgpu_clk_arb {
217 u16 *gpc2clk_f_points; 217 u16 *gpc2clk_f_points;
218 u32 gpc2clk_f_numpoints; 218 u32 gpc2clk_f_numpoints;
219 219
220 bool clk_arb_events_supported;
221
220 nvgpu_atomic64_t alarm_mask; 222 nvgpu_atomic64_t alarm_mask;
221 struct nvgpu_clk_notification_queue notification_queue; 223 struct nvgpu_clk_notification_queue notification_queue;
222 224
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 5821f742..b8ca5754 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -1117,6 +1117,8 @@ struct gpu_ops {
1117 struct { 1117 struct {
1118 int (*arbiter_clk_init)(struct gk20a *g); 1118 int (*arbiter_clk_init)(struct gk20a *g);
1119 u32 (*get_arbiter_clk_domains)(struct gk20a *g); 1119 u32 (*get_arbiter_clk_domains)(struct gk20a *g);
1120 int (*get_arbiter_f_points)(struct gk20a *g,u32 api_domain,
1121 u32 *num_points, u16 *freqs_in_mhz);
1120 int (*get_arbiter_clk_range)(struct gk20a *g, u32 api_domain, 1122 int (*get_arbiter_clk_range)(struct gk20a *g, u32 api_domain,
1121 u16 *min_mhz, u16 *max_mhz); 1123 u16 *min_mhz, u16 *max_mhz);
1122 int (*get_arbiter_clk_default)(struct gk20a *g, u32 api_domain, 1124 int (*get_arbiter_clk_default)(struct gk20a *g, u32 api_domain,