From 7d0bd72fde50ad004d172dd2a98f3183d4049b58 Mon Sep 17 00:00:00 2001 From: Ramesh Mylavarapu Date: Wed, 12 May 2021 20:33:13 +0530 Subject: [PATCH] gpu: nvgpu: add clk arbiter check Check for NVGPU_CLK_ARB_ENABLED flag before initiating clk crbiter session which shouldn't be initiated in absence of clk arbiter. Bug 3236519 Signed-off-by: Ramesh Mylavarapu Change-Id: I945203164063cec35fbab2256b3c7cb983e520ea Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2528551 Tested-by: mobile promotions Reviewed-by: svcacv Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index da2b702bf..3f68113d5 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c @@ -152,7 +152,9 @@ int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp) gk20a_idle(g); } - err = nvgpu_clk_arb_init_session(g, &priv->clk_session); + if (nvgpu_is_enabled(g, NVGPU_CLK_ARB_ENABLED)) { + err = nvgpu_clk_arb_init_session(g, &priv->clk_session); + } free_ref: if (err != 0) { nvgpu_put(g);