diff options
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 10 | ||||
-rw-r--r-- | include/uapi/linux/nvgpu.h | 4 |
3 files changed, 24 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 1d712d57..8cd5cc7c 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -15,6 +15,12 @@ ccflags-y += -I$(srctree)/../kernel-nvgpu-t18x/include | |||
15 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t18x/include/uapi | 15 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t18x/include/uapi |
16 | endif | 16 | endif |
17 | 17 | ||
18 | ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) | ||
19 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t19x/drivers/gpu/nvgpu | ||
20 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t19x/include | ||
21 | ccflags-y += -I$(srctree)/../kernel-nvgpu-t19x/include/uapi | ||
22 | endif | ||
23 | |||
18 | obj-$(CONFIG_GK20A) := nvgpu.o | 24 | obj-$(CONFIG_GK20A) := nvgpu.o |
19 | 25 | ||
20 | nvgpu-y := \ | 26 | nvgpu-y := \ |
@@ -100,3 +106,7 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ | |||
100 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | 106 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) |
101 | include ../kernel-nvgpu-t18x/drivers/gpu/nvgpu/Makefile | 107 | include ../kernel-nvgpu-t18x/drivers/gpu/nvgpu/Makefile |
102 | endif | 108 | endif |
109 | |||
110 | ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) | ||
111 | include ../kernel-nvgpu-t19x/drivers/gpu/nvgpu/Makefile | ||
112 | endif | ||
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index 7755bf7d..16ba4a03 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -21,6 +21,10 @@ | |||
21 | #include "nvgpu_gpuid_t18x.h" | 21 | #include "nvgpu_gpuid_t18x.h" |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | #ifdef CONFIG_ARCH_TEGRA_19x_SOC | ||
25 | #include "nvgpu_gpuid_t19x.h" | ||
26 | #endif | ||
27 | |||
24 | int gpu_init_hal(struct gk20a *g) | 28 | int gpu_init_hal(struct gk20a *g) |
25 | { | 29 | { |
26 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 30 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; |
@@ -40,6 +44,12 @@ int gpu_init_hal(struct gk20a *g) | |||
40 | return -ENODEV; | 44 | return -ENODEV; |
41 | break; | 45 | break; |
42 | #endif | 46 | #endif |
47 | #if defined(CONFIG_ARCH_TEGRA_19x_SOC) | ||
48 | case TEGRA_19x_GPUID: | ||
49 | if (TEGRA_19x_GPUID_HAL(g)) | ||
50 | return -ENODEV; | ||
51 | break; | ||
52 | #endif | ||
43 | default: | 53 | default: |
44 | gk20a_err(g->dev, "no support for %x", ver); | 54 | gk20a_err(g->dev, "no support for %x", ver); |
45 | return -ENODEV; | 55 | return -ENODEV; |
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index a75a5ae0..d84c5440 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h | |||
@@ -92,6 +92,10 @@ struct nvgpu_gpu_zbc_query_table_args { | |||
92 | #include <linux/nvgpu-t18x.h> | 92 | #include <linux/nvgpu-t18x.h> |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | #ifdef CONFIG_ARCH_TEGRA_19x_SOC | ||
96 | #include <linux/nvgpu-t19x.h> | ||
97 | #endif | ||
98 | |||
95 | #define NVGPU_GPU_BUS_TYPE_NONE 0 | 99 | #define NVGPU_GPU_BUS_TYPE_NONE 0 |
96 | #define NVGPU_GPU_BUS_TYPE_AXI 32 | 100 | #define NVGPU_GPU_BUS_TYPE_AXI 32 |
97 | 101 | ||