nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: spec_barrier & DMA_ERROR_CODE update

Browse Source 
These macros are not defined in future kernel.

Bug 2834141

Change-Id: Ib2ee419b66f4d949fd538dfbb04b8cffa73c1e44
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2299626
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sagar Kamble
2020-02-14 20:09:45 +05:30
committed by Alex Waterman
parent 4fd8df5ca0
commit 18f9d05aae
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/include/nvgpu/linux/barrier.h
View File

@@ -30,6 +30,12 @@
#define NV_READ_ONCE_IMPL(x) READ_ONCE(x)
#define NV_WRITE_ONCE_IMPL(x, y) WRITE_ONCE(x, y)
#ifdef speculation_barrier
#define nvgpu_speculation_barrier_impl() speculation_barrier()
#else
#define nvgpu_speculation_barrier_impl() ({ \
asm volatile("dsb sy\n" \
"isb\n" : : : "memory"); })
#endif
#endif /* __NVGPU_BARRIER_LINUX_H__ */

6
drivers/gpu/nvgpu/os/linux/nvgpu_mem.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2017-2020, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -37,6 +37,10 @@
#include "platform_gk20a.h"
#ifndef DMA_ERROR_CODE
#define DMA_ERROR_CODE DMA_MAPPING_ERROR
#endif
static u64 __nvgpu_sgl_ipa(struct gk20a *g, void *sgl)
{
return sg_phys((struct scatterlist *)sgl);