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

nvgpu: userspace: make channel-devctl visible to SWUTS

Browse Source 
Add reference link to channel-devctl in SWUTS.

Fix unresolved merge conflict which managed to sneak into the branch.

Jira: NVGPU-4827

Change-Id: I99ba52603412ad3d4cb467e1dbdd6bbc5b31c344
Signed-off-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2282371
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Antony Clince Alex
2020-01-20 15:03:41 +05:30
committed by Alex Waterman
parent 7f73c5fc20
commit bd5604bba7
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
userspace/SWUTS.h
View File

@@ -139,6 +139,7 @@
* - @ref SWUTS-gr-obj-ctx * - @ref SWUTS-gr-obj-ctx
* - @ref SWUTS-gr-config * - @ref SWUTS-gr-config
* - @ref SWUTS-ecc * - @ref SWUTS-ecc
* - @ref SWUTS-channel_devctl_qnx
* *
*/ */

3
userspace/SWUTS.sources
View File

@@ -1,9 +1,6 @@
INPUT += ../../../userspace/SWUTS.h INPUT += ../../../userspace/SWUTS.h
<<<<<<< d9538d12c25f23f90bfb5978be79cdc4ff69f114
INPUT += ../../../userspace/units/ce/nvgpu-ce.h INPUT += ../../../userspace/units/ce/nvgpu-ce.h
INPUT += ../../../userspace/units/cg/nvgpu-cg.h INPUT += ../../../userspace/units/cg/nvgpu-cg.h
=======
>>>>>>> gpu: nvgpu: unit: improve coverage for engines
INPUT += ../../../userspace/units/enabled/nvgpu-enabled.h INPUT += ../../../userspace/units/enabled/nvgpu-enabled.h
INPUT += ../../../userspace/units/interface/bit-utils/bit-utils.h INPUT += ../../../userspace/units/interface/bit-utils/bit-utils.h
INPUT += ../../../userspace/units/interface/bsearch/bsearch.h INPUT += ../../../userspace/units/interface/bsearch/bsearch.h