diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 53de45b9..c51a0948 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -4,6 +4,7 @@ ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu/include | |||
4 | ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu | 4 | ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu |
5 | ccflags-y += -I$(srctree.nvgpu)/include | 5 | ccflags-y += -I$(srctree.nvgpu)/include |
6 | ccflags-y += -I$(srctree.nvgpu)/include/uapi | 6 | ccflags-y += -I$(srctree.nvgpu)/include/uapi |
7 | ccflags-y += -I$(srctree.nvgpu-next)/drivers/gpu/nvgpu | ||
7 | 8 | ||
8 | ccflags-y += -I$(srctree)/drivers/devfreq | 9 | ccflags-y += -I$(srctree)/drivers/devfreq |
9 | 10 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index ec6816c6..939567e7 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -29,6 +29,9 @@ | |||
29 | #include "gp106/hal_gp106.h" | 29 | #include "gp106/hal_gp106.h" |
30 | #include "gv100/hal_gv100.h" | 30 | #include "gv100/hal_gv100.h" |
31 | #include "gv11b/hal_gv11b.h" | 31 | #include "gv11b/hal_gv11b.h" |
32 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
33 | #include "nvgpu_gpuid_next.h" | ||
34 | #endif | ||
32 | 35 | ||
33 | #include <nvgpu/log.h> | 36 | #include <nvgpu/log.h> |
34 | 37 | ||
@@ -59,6 +62,12 @@ int gpu_init_hal(struct gk20a *g) | |||
59 | if (gv100_init_hal(g)) | 62 | if (gv100_init_hal(g)) |
60 | return -ENODEV; | 63 | return -ENODEV; |
61 | break; | 64 | break; |
65 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
66 | case NVGPU_GPUID_NEXT: | ||
67 | if (NVGPU_NEXT_INIT_HAL(g)) | ||
68 | return -ENODEV; | ||
69 | break; | ||
70 | #endif | ||
62 | 71 | ||
63 | default: | 72 | default: |
64 | nvgpu_err(g, "no support for %x", ver); | 73 | nvgpu_err(g, "no support for %x", ver); |