From 907e8d7409b0687abf162424f0feab797d5f89f5 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 3 Jan 2019 16:04:08 -0800 Subject: [PATCH] gpu: nvgpu: vgpu: add vgpu_init_hal_os The goal is to make vgpu_init_hal to be common across OSes, then we can commonize more functions. OSes have to implement vgpu_init_hal_os. For linux, it's empty. Jira GVSCI-82 Change-Id: I6c8263fa884a726a8bec4c57bbf840adb86a8a56 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1987234 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: Aparna Das GVS: Gerrit_Virtual_Submit Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h | 1 + drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 5 +++++ drivers/gpu/nvgpu/vgpu/vgpu.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h index 752c35fa9..e251ac717 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h @@ -80,6 +80,7 @@ int vgpu_get_timestamps_zipper(struct gk20a *g, u32 source_id, u32 count, struct nvgpu_cpu_time_correlation_sample *samples); int vgpu_init_hal(struct gk20a *g); +int vgpu_init_hal_os(struct gk20a *g); int vgpu_get_constants(struct gk20a *g); u64 vgpu_mm_bar1_map_userd(struct gk20a *g, struct nvgpu_mem *mem, u32 offset); int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info); diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 114735bcd..827a7737d 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -545,3 +545,8 @@ int vgpu_tegra_resume(struct device *dev) return err; } + +int vgpu_init_hal_os(struct gk20a *g) +{ + return 0; +} diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 96c6ede88..7141cbfd6 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -363,6 +363,10 @@ int vgpu_init_hal(struct gk20a *g) break; } + if (err == 0) { + err = vgpu_init_hal_os(g); + } + return err; }