From f3f14cdff53f4b936e2505d44aad6e3bca143056 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 17 Jan 2018 12:39:13 -0800 Subject: gpu: nvgpu: Fold T19x code back to main code paths Lots of code paths were split to T19x specific code paths and structs due to split repository. Now that repositories are merged, fold all of them back to main code paths and structs and remove the T19x specific Kconfig flag. Change-Id: Id0d17a5f0610fc0b49f51ab6664e716dc8b222b6 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1640606 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/acr_gp106.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/acr_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 0dfa8e0e..31ddecf0 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -35,17 +35,13 @@ #include "gm20b/acr_gm20b.h" #include "gp106/acr_gp106.h" #include "gp106/pmu_gp106.h" +#include "gv100/acr_gv100.h" #include "sec2_gp106.h" #include #include -#ifdef CONFIG_TEGRA_19x_GPU -#include "nvgpu_gpuid_t19x.h" -#include "acr_t19x.h" -#endif - /*Defines*/ #define gp106_dbg_pmu(fmt, arg...) \ gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) @@ -200,17 +196,15 @@ int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) GP106_FECS_UCODE_SIG, NVGPU_REQUEST_FIRMWARE_NO_SOC); break; -#if defined(CONFIG_TEGRA_19x_GPU) - case TEGRA_19x_GPUID: + case NVGPU_GPUID_GV11B: fecs_sig = nvgpu_request_firmware(g, GM20B_FECS_UCODE_SIG, 0); break; - case BIGGPU_19x_GPUID: + case NVGPU_GPUID_GV100: fecs_sig = nvgpu_request_firmware(g, - BIGGPU_FECS_UCODE_SIG, + GV100_FECS_UCODE_SIG, NVGPU_REQUEST_FIRMWARE_NO_SOC); break; -#endif default: nvgpu_err(g, "no support for GPUID %x", ver); } @@ -297,17 +291,15 @@ int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) GP106_GPCCS_UCODE_SIG, NVGPU_REQUEST_FIRMWARE_NO_SOC); break; -#if defined(CONFIG_TEGRA_19x_GPU) - case TEGRA_19x_GPUID: + case NVGPU_GPUID_GV11B: gpccs_sig = nvgpu_request_firmware(g, T18x_GPCCS_UCODE_SIG, 0); break; - case BIGGPU_19x_GPUID: + case NVGPU_GPUID_GV100: gpccs_sig = nvgpu_request_firmware(g, - BIGGPU_GPCCS_UCODE_SIG, + GV100_GPCCS_UCODE_SIG, NVGPU_REQUEST_FIRMWARE_NO_SOC); break; -#endif default: nvgpu_err(g, "no support for GPUID %x", ver); } -- cgit v1.2.2