nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Fix OOT build for Linux v5.14

Browse Source 
For building NVGPU as an out-of-tree we support Linux v5.14+ kernels.
NVGPU is no longer building as an out-of-tree module for v5.14 because
the tegra-ivc.h header is not found. Update the driver for use the
appropriate header for Linux v5.14.

Bug 3812973

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Change-Id: I268ca8a56d04f1801200ff7fb6838b670a0c48d5
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2828088
Reviewed-by: Dinesh T <dt@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2022-12-14 19:26:10 +00:00
committed by mobile promotions
parent 31b2738f6a
commit a8e38dd72d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/cbc/contig_pool.c
View File

@@ -24,7 +24,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/version.h> #include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
#include <linux/tegra-ivc.h> #include <linux/tegra-ivc.h>
#else #else
#include <soc/tegra/virt/hv-ivc.h> #include <soc/tegra/virt/hv-ivc.h>

2
drivers/gpu/nvgpu/os/linux/nvgpu_ivm.c
View File

@@ -15,7 +15,7 @@
*/ */
#include <linux/version.h> #include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
#include <linux/tegra-ivc.h> #include <linux/tegra-ivc.h>
#else #else
#include <soc/tegra/virt/hv-ivc.h> #include <soc/tegra/virt/hv-ivc.h>

4
drivers/gpu/nvgpu/os/linux/soc.c
View File

@@ -15,7 +15,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
#include <soc/tegra/chip-id.h> #include <soc/tegra/chip-id.h>
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
#include <soc/tegra/fuse.h> #include <soc/tegra/fuse.h>
#else #else
#include <soc/tegra/virt/hv-ivc.h> #include <soc/tegra/virt/hv-ivc.h>
@@ -50,7 +50,7 @@ bool nvgpu_is_hypervisor_mode(struct gk20a *g)
bool nvgpu_is_soc_t194_a01(struct gk20a *g) bool nvgpu_is_soc_t194_a01(struct gk20a *g)
{ {
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
struct device *dev = dev_from_gk20a(g); struct device *dev = dev_from_gk20a(g);
struct gk20a_platform *platform = gk20a_get_platform(dev); struct gk20a_platform *platform = gk20a_get_platform(dev);