diff options
author | Richard Zhao <rizhao@nvidia.com> | 2018-01-10 19:06:30 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-01-12 15:43:40 -0500 |
commit | 9dd3bb2e62c321bb48c14f3e76c00a754cd12c5f (patch) | |
tree | 48e1242d3f17ae0ef02ef0f724c95ce5c30b6338 /drivers/gpu/nvgpu/common/linux/module.c | |
parent | ece3d958b306f00dad76ed6f9b83ce136b4769f2 (diff) |
gpu: nvgpu: vgpu: move t19x specific code to general code
- remove vgpu_t19x.h and tegra_vgpu_t19x.h
- merge t19x specific ivc commands to the big enum
- move TEGRA_VGPU_ATTRIB_MAX_SUBCTX_COUNT to constants
Jira EVLR-2293
Change-Id: I34344bffa03bb69e1282b1f19382e3199f9ba105
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1636128
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/module.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index cc2b5ec7..b95bac0b 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -52,9 +52,6 @@ | |||
52 | #include "sim.h" | 52 | #include "sim.h" |
53 | #ifdef CONFIG_TEGRA_19x_GPU | 53 | #ifdef CONFIG_TEGRA_19x_GPU |
54 | #include "nvgpu_gpuid_t19x.h" | 54 | #include "nvgpu_gpuid_t19x.h" |
55 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | ||
56 | #include "vgpu/vgpu_t19x.h" | ||
57 | #endif | ||
58 | #endif | 55 | #endif |
59 | 56 | ||
60 | #include "os_linux.h" | 57 | #include "os_linux.h" |
@@ -389,8 +386,8 @@ static struct of_device_id tegra_gk20a_of_match[] = { | |||
389 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, | 386 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, |
390 | .data = &t19x_gpu_tegra_platform }, | 387 | .data = &t19x_gpu_tegra_platform }, |
391 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 388 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |
392 | { .compatible = TEGRA_19x_VGPU_COMPAT_TEGRA, | 389 | { .compatible = "nvidia,gv11b-vgpu", |
393 | .data = &t19x_vgpu_tegra_platform }, | 390 | .data = &gv11b_vgpu_tegra_platform}, |
394 | #endif | 391 | #endif |
395 | #endif | 392 | #endif |
396 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 393 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |