From d465504534b2ec7ab0be190fc98b24e1b77634e2 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 14 Feb 2017 12:52:20 +0530 Subject: gpu: nvgpu: Remove PMU gm204/gm206 support -Created new methods for PMU gp106 whichever dependent on gm206. -Deleted pmu_gm206.c/h files & removed its involvement from dependent files. Change-Id: Ic578da53bff362efb3e142962275227787206233 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1304492 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp106/acr_gp106.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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 f8d7ba70..f5a4053b 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -24,7 +24,7 @@ #include "gm206/acr_gm206.h" #include "gm20b/acr_gm20b.h" -#include "gm206/pmu_gm206.h" +#include "gp106/pmu_gp106.h" #include "sec2_gp106.h" #include "nvgpu_gpuid_t18x.h" @@ -122,8 +122,6 @@ void gp106_init_secure_pmu(struct gpu_ops *gops) { gops->pmu.prepare_ucode = gp106_prepare_ucode_blob; gops->pmu.pmu_setup_hw_and_bootstrap = gp106_bootstrap_hs_flcn; - gops->pmu.is_lazy_bootstrap = gm206_is_lazy_bootstrap; - gops->pmu.is_priv_load = gm206_is_priv_load; gops->pmu.get_wpr = gp106_wpr_info; gops->pmu.alloc_blob_space = gp106_alloc_blob_space; gops->pmu.pmu_populate_loader_cfg = gp106_pmu_populate_loader_cfg; -- cgit v1.2.2