summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/acr_gp106.c
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2017-02-14 02:22:20 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-02-15 22:33:28 -0500
commitd465504534b2ec7ab0be190fc98b24e1b77634e2 (patch)
tree3ee1a90cb49cb2a3df3b39c79b37bdbcddeffe97 /drivers/gpu/nvgpu/gp106/acr_gp106.c
parent907adfd785e3a3582b2649c48bf4c32f41745e3f (diff)
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 <mkumbar@nvidia.com> Reviewed-on: http://git-master/r/1304492 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/acr_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/acr_gp106.c6
1 files changed, 2 insertions, 4 deletions
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 @@
1/* 1/*
2 * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU General Public License, 5 * under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@
24 24
25#include "gm206/acr_gm206.h" 25#include "gm206/acr_gm206.h"
26#include "gm20b/acr_gm20b.h" 26#include "gm20b/acr_gm20b.h"
27#include "gm206/pmu_gm206.h" 27#include "gp106/pmu_gp106.h"
28 28
29#include "sec2_gp106.h" 29#include "sec2_gp106.h"
30#include "nvgpu_gpuid_t18x.h" 30#include "nvgpu_gpuid_t18x.h"
@@ -122,8 +122,6 @@ void gp106_init_secure_pmu(struct gpu_ops *gops)
122{ 122{
123 gops->pmu.prepare_ucode = gp106_prepare_ucode_blob; 123 gops->pmu.prepare_ucode = gp106_prepare_ucode_blob;
124 gops->pmu.pmu_setup_hw_and_bootstrap = gp106_bootstrap_hs_flcn; 124 gops->pmu.pmu_setup_hw_and_bootstrap = gp106_bootstrap_hs_flcn;
125 gops->pmu.is_lazy_bootstrap = gm206_is_lazy_bootstrap;
126 gops->pmu.is_priv_load = gm206_is_priv_load;
127 gops->pmu.get_wpr = gp106_wpr_info; 125 gops->pmu.get_wpr = gp106_wpr_info;
128 gops->pmu.alloc_blob_space = gp106_alloc_blob_space; 126 gops->pmu.alloc_blob_space = gp106_alloc_blob_space;
129 gops->pmu.pmu_populate_loader_cfg = gp106_pmu_populate_loader_cfg; 127 gops->pmu.pmu_populate_loader_cfg = gp106_pmu_populate_loader_cfg;