From c616fba1eb357684e3796603a226f4df7d88be73 Mon Sep 17 00:00:00 2001 From: ddutta Date: Mon, 17 Sep 2018 13:09:18 +0530 Subject: gpu: nvgpu: remove circular dependency between hal.c and gk20a/ gk20a/hal.c depends on HAL init functions in all chips. But all chips also depend on gk20a. That creates a circular dependency. In order to solve the above, move gpu_init_hal and gk20a_detect_chip to common/init/hal_init.c. These methods are declared in include/nvgpu/hal_init.h. Also, the above methods are renamed to nvgpu_init_hal and nvgpu_detect_chip respectively. Jira NVGPU-613 Change-Id: Ib0df90287d4491571e4751475739b75fabd1041b Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1827576 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 1 - drivers/gpu/nvgpu/include/nvgpu/hal_init.h | 33 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/nvgpu/include/nvgpu/hal_init.h (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index a653109a..244b6ed2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -1761,5 +1761,4 @@ static inline bool gk20a_platform_has_syncpoints(struct gk20a *g) #endif } -int gk20a_detect_chip(struct gk20a *g); #endif /* GK20A_H */ diff --git a/drivers/gpu/nvgpu/include/nvgpu/hal_init.h b/drivers/gpu/nvgpu/include/nvgpu/hal_init.h new file mode 100644 index 00000000..06e58e70 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/hal_init.h @@ -0,0 +1,33 @@ +/* + * NVIDIA GPU Hardware Abstraction Layer functions definitions. + * + * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef NVGPU_HAL_INIT_H +#define NVGPU_HAL_INIT_H + +struct gk20a; + +int nvgpu_init_hal(struct gk20a *g); +int nvgpu_detect_chip(struct gk20a *g); + +#endif /* NVGPU_HAL_INIT_H */ -- cgit v1.2.2