From a18be36a15b2a1d0dc5027d3f337fc174997b9d9 Mon Sep 17 00:00:00 2001
From: dt
Date: Tue, 27 Apr 2021 19:33:06 +0000
Subject: [PATCH] gpu: nvgpu: Fixing SWDVR issues in qnx-mem and qnx-sync
This is fixing some swdvr issues found during swdvr process.
JIRA NVGPU-6613
JIRA NVGPU-6614
Signed-off-by: dt
Change-Id: Iadbdefd1ed57f9a3fb46690c9ad4b6e38a876b31
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2521352
Tested-by: mobile promotions
Reviewed-by: Vaibhav Kachore
Reviewed-by: mobile promotions
GVS: Gerrit_Virtual_Submit
---
drivers/gpu/nvgpu/include/nvgpu/dma.h | 4 +++-
drivers/gpu/nvgpu/include/nvgpu/nvhost.h | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/dma.h b/drivers/gpu/nvgpu/include/nvgpu/dma.h
index b74832b80..725a5dd14 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/dma.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/dma.h
@@ -155,7 +155,9 @@ int nvgpu_dma_alloc_sys(struct gk20a *g, size_t size, struct nvgpu_mem *mem);
*
* Allocate memory suitable for doing DMA. Store the allocation info in #mem.
* Returns 0 on success and a suitable error code when there's an error. This
- * allocates memory specifically in SYSMEM.
+ * allocates memory specifically in SYSMEM. If the #mem already holds the physical
+ * memory information, then the API just create the import id associated with
+ * the #mem.
*
* @return 0 For success, < 0 for failure.
* @retval -ENOMEM For failure in handle creation or mapping operation.
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
index d245a6477..82526437d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2020, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2017-2021, NVIDIA CORPORATION. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -44,8 +44,6 @@ struct nvgpu_nvhost_dev;
* @param g [in] The GPU super structure.
*
* - Allocate memory for g.nvhost_dev.
- * - Get the type of the hardware(t186/t194) by calling
- * #NvTegraSysGetChipId().
* - Initialize the number of synpoints according to the
* associated hardware.
* - Allocate and initialize different fields associated with