summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux')
-rw-r--r--drivers/gpu/nvgpu/common/linux/dmabuf.h3
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/os_linux.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.h b/drivers/gpu/nvgpu/common/linux/dmabuf.h
index 718386c5..b4b61459 100644
--- a/drivers/gpu/nvgpu/common/linux/dmabuf.h
+++ b/drivers/gpu/nvgpu/common/linux/dmabuf.h
@@ -70,4 +70,7 @@ int gk20a_dmabuf_alloc_drvdata(struct dma_buf *dmabuf, struct device *dev);
70int gk20a_dmabuf_get_state(struct dma_buf *dmabuf, struct gk20a *g, 70int gk20a_dmabuf_get_state(struct dma_buf *dmabuf, struct gk20a *g,
71 u64 offset, struct gk20a_buffer_state **state); 71 u64 offset, struct gk20a_buffer_state **state);
72 72
73int gk20a_mm_get_buffer_info(struct device *dev, int dmabuf_fd,
74 u64 *buffer_id, u64 *buffer_len);
75
73#endif 76#endif
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 6c9fc26f..1e5a9d59 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -43,6 +43,7 @@
43#include "gk20a/fence_gk20a.h" 43#include "gk20a/fence_gk20a.h"
44 44
45#include "os_linux.h" 45#include "os_linux.h"
46#include "dmabuf.h"
46 47
47#define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \ 48#define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \
48 (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ)) 49 (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ))
diff --git a/drivers/gpu/nvgpu/common/linux/os_linux.h b/drivers/gpu/nvgpu/common/linux/os_linux.h
index 9bb9e9f4..07be7edc 100644
--- a/drivers/gpu/nvgpu/common/linux/os_linux.h
+++ b/drivers/gpu/nvgpu/common/linux/os_linux.h
@@ -13,10 +13,12 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16
16#ifndef NVGPU_OS_LINUX_H 17#ifndef NVGPU_OS_LINUX_H
17#define NVGPU_OS_LINUX_H 18#define NVGPU_OS_LINUX_H
18 19
19#include <linux/cdev.h> 20#include <linux/cdev.h>
21#include <linux/iommu.h>
20 22
21#ifdef CONFIG_TEGRA_19x_GPU 23#ifdef CONFIG_TEGRA_19x_GPU
22#include <nvgpu/linux/os_linux_t19x.h> 24#include <nvgpu/linux/os_linux_t19x.h>