From 802aadf2638dd020a9fcfa7931afda66c4ba3805 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 14 Jan 2022 09:32:03 -0800 Subject: [PATCH] nvgpu: move nvgpu_falcon_copy_from/to_emem out of CONFIG_NVGPU_DGPU nvgpu_falcon_copy_from/to_emem are also used by iGPU in engine_emem_queue. Jira GVSCI-9976 Signed-off-by: Richard Zhao Change-Id: Ia36a38521807714eb5ad52b6e81c9f31ecc8fda6 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2708509 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Mahantesh Kumbar Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/falcon/falcon.c | 2 -- drivers/gpu/nvgpu/include/nvgpu/falcon.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/gpu/nvgpu/common/falcon/falcon.c b/drivers/gpu/nvgpu/common/falcon/falcon.c index 1d9adf666..ad89a1fa7 100644 --- a/drivers/gpu/nvgpu/common/falcon/falcon.c +++ b/drivers/gpu/nvgpu/common/falcon/falcon.c @@ -623,7 +623,6 @@ int nvgpu_falcon_get_mem_size(struct nvgpu_falcon *flcn, return 0; } -#ifdef CONFIG_NVGPU_DGPU int nvgpu_falcon_copy_from_emem(struct nvgpu_falcon *flcn, u32 src, u8 *dst, u32 size, u8 port) { @@ -679,7 +678,6 @@ int nvgpu_falcon_copy_to_emem(struct nvgpu_falcon *flcn, exit: return status; } -#endif #ifdef CONFIG_NVGPU_FALCON_DEBUG void nvgpu_falcon_dump_stats(struct nvgpu_falcon *flcn) diff --git a/drivers/gpu/nvgpu/include/nvgpu/falcon.h b/drivers/gpu/nvgpu/include/nvgpu/falcon.h index bfe4018b5..db1475945 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/falcon.h +++ b/drivers/gpu/nvgpu/include/nvgpu/falcon.h @@ -718,12 +718,10 @@ bool nvgpu_falcon_is_feature_supported(struct nvgpu_falcon *flcn, int nvgpu_falcon_wait_for_nvriscv_brom_completion(struct nvgpu_falcon *flcn); -#ifdef CONFIG_NVGPU_DGPU int nvgpu_falcon_copy_from_emem(struct nvgpu_falcon *flcn, u32 src, u8 *dst, u32 size, u8 port); int nvgpu_falcon_copy_to_emem(struct nvgpu_falcon *flcn, u32 dst, u8 *src, u32 size, u8 port); -#endif #ifdef CONFIG_NVGPU_FALCON_DEBUG void nvgpu_falcon_dump_stats(struct nvgpu_falcon *flcn);