nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvidia-oot: enable hypervisor support for nvmap

Browse Source 
hypervisor macro CONFIG_TEGRA_VIRTUALIZATION is not enabled
for OOT nvmap build.

Bug 4121631

Change-Id: I8a1fc94335da8ca7a22d549b0e1850dd308722b8
Signed-off-by: brucex <brucex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2921005
Reviewed-by: Tuomas Kulve <tkulve@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: Ketan Patil <ketanp@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
brucex
2023-06-14 13:37:56 +08:00
committed by mobile promotions
parent c64e2ce3d1
commit bf7d14249c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/tegra/nvmap/Makefile
View File

@@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror
include $(srctree.nvidia-oot)/drivers/video/tegra/nvmap/Makefile.memory.configs include $(srctree.nvidia-oot)/drivers/video/tegra/nvmap/Makefile.memory.configs
ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
endif
ifeq ($(NVMAP_CONFIG), y) ifeq ($(NVMAP_CONFIG), y)
# Build NvMap only when NVMAP_CONFIG is set to y # Build NvMap only when NVMAP_CONFIG is set to y
nvmap-y := nvmap_core.o \ nvmap-y := nvmap_core.o \

4
drivers/video/tegra/nvmap/nvmap_init.c
View File

@@ -37,7 +37,11 @@
#include "nvmap_priv.h" #include "nvmap_priv.h"
#ifdef CONFIG_TEGRA_VIRTUALIZATION #ifdef CONFIG_TEGRA_VIRTUALIZATION
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
#include <linux/tegra-ivc.h> #include <linux/tegra-ivc.h>
#else
#include <soc/tegra/virt/hv-ivc.h>
#endif
#include <soc/tegra/virt/syscalls.h> #include <soc/tegra/virt/syscalls.h>
#endif #endif