From 519948a9c664020fd0b37118749faad2dfd73d97 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Tue, 4 Sep 2018 10:55:33 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1774281 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c | 11 +++++++++++ drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c | 2 ++ drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c | 2 ++ 3 files changed, 15 insertions(+) (limited to 'drivers/gpu/nvgpu/os') diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c index 501b5f93..2d9946b1 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c @@ -55,6 +55,13 @@ static int nvgpu_clk_arb_release_completion_dev(struct inode *inode, clk_arb_dbg(session->g, " "); + /* This is done to account for the extra refcount taken in + * nvgpu_clk_arb_commit_request_fd without events support in iGPU + */ + if (!session->g->clk_arb->clk_arb_events_supported) { + nvgpu_ref_put(&dev->refcount, nvgpu_clk_arb_free_fd); + } + nvgpu_ref_put(&session->refcount, nvgpu_clk_arb_free_session); nvgpu_ref_put(&dev->refcount, nvgpu_clk_arb_free_fd); return 0; @@ -425,6 +432,10 @@ int nvgpu_clk_arb_commit_request_fd(struct gk20a *g, err = -EINVAL; goto fdput_fd; } + + clk_arb_dbg(g, "requested target = %u\n", + (u32)dev->gpc2clk_target_mhz); + nvgpu_ref_get(&dev->refcount); nvgpu_spinlock_acquire(&session->session_lock); nvgpu_list_add(&dev->node, &session->targets); diff --git a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c index 5fdcb05c..a792bfcb 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c @@ -171,6 +171,8 @@ static int gp10b_tegra_probe(struct device *dev) nvgpu_mutex_init(&platform->clk_get_freq_lock); + platform->g->ops.clk.support_clk_freq_controller = true; + return 0; } diff --git a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c index b055eb6e..ec93b4c3 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c @@ -99,6 +99,8 @@ static int gv11b_tegra_probe(struct device *dev) nvgpu_mutex_init(&platform->clk_get_freq_lock); + platform->g->ops.clk.support_clk_freq_controller = true; + return 0; } -- cgit v1.2.2