From 9dd3bb2e62c321bb48c14f3e76c00a754cd12c5f Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 10 Jan 2018 16:06:30 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1636128 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/module.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/module.c') 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 @@ #include "sim.h" #ifdef CONFIG_TEGRA_19x_GPU #include "nvgpu_gpuid_t19x.h" -#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION -#include "vgpu/vgpu_t19x.h" -#endif #endif #include "os_linux.h" @@ -389,8 +386,8 @@ static struct of_device_id tegra_gk20a_of_match[] = { { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, .data = &t19x_gpu_tegra_platform }, #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION - { .compatible = TEGRA_19x_VGPU_COMPAT_TEGRA, - .data = &t19x_vgpu_tegra_platform }, + { .compatible = "nvidia,gv11b-vgpu", + .data = &gv11b_vgpu_tegra_platform}, #endif #endif #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION -- cgit v1.2.2