From 17bcea0023e9e599be9f5a131ce16fd2f7a7c56d Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 24 Dec 2019 10:07:37 -0800 Subject: [PATCH] gpu: nvgpu: t23x: add TEGRA_234 chip id Add TEGRA_234 as supported tegra chip id and add nvgpu_next platform data to supported platforms. JIRA NVGPU-4383 Change-Id: I07eb88ca5a7f18516291066267ee41c002dc46bb Signed-off-by: Seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2258722 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seema Khowala GVS: Gerrit_Virtual_Submit Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/module.c | 11 +++++++++-- drivers/gpu/nvgpu/os/linux/platform_gk20a.h | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c index b2af76ffb..fe56fcd08 100644 --- a/drivers/gpu/nvgpu/os/linux/module.c +++ b/drivers/gpu/nvgpu/os/linux/module.c @@ -1,7 +1,7 @@ /* * GK20A Graphics * - * Copyright (c) 2011-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2020, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -81,6 +81,10 @@ #include "cde.h" #endif +#if defined(CONFIG_NVGPU_NEXT) && defined(CONFIG_NVGPU_NON_FUSA) +#include "nvgpu_next_gpuid.h" +#endif + #define CLASS_NAME "nvidia-gpu" /* TODO: Change to e.g. "nvidia-gpu%s" once we have symlinks in place. */ @@ -707,8 +711,11 @@ static struct of_device_id tegra_gk20a_of_match[] = { { .compatible = "nvidia,tegra124-gk20a-vgpu", .data = &vgpu_tegra_platform }, #endif +#if defined(CONFIG_NVGPU_NEXT) && defined(CONFIG_NVGPU_NON_FUSA) + { .compatible = NVGPU_NEXT_COMPATIBLE, + .data = &NVGPU_NEXT_PLATFORM}, +#endif #endif - { }, }; MODULE_DEVICE_TABLE(of, tegra_gk20a_of_match); diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h index 9a8b30672..d7a4458db 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h @@ -1,7 +1,7 @@ /* * GK20A Platform (SoC) Interface * - * Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -62,6 +62,7 @@ enum tegra_chip_id { TEGRA_194, TEGRA_194_VGPU, TEGRA_124_VGPU, + TEGRA_234, }; struct gk20a_platform {