From ed35f0a4042074463bf52ba04583fde680d1d389 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 9 Feb 2017 08:32:02 -0800 Subject: gpu: nvgpu: Add enable/disable shadow ROM HAL Add HAL for enabling and disabling shadow ROM. This removes XVE dependency from bios code. Change-Id: Icafec72dae71669376bbfb97077661b7165badb8 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1302223 --- drivers/gpu/nvgpu/gm206/bios_gm206.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206') diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index bfb90e19..fa736da5 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c @@ -24,7 +24,6 @@ #include #include -#include #include #define BIT_HEADER_ID 0xb8ff @@ -868,8 +867,7 @@ static int gm206_bios_init(struct gk20a *g) g->bios.data = vmalloc(BIOS_SIZE); if (!g->bios.data) return -ENOMEM; - gk20a_writel(g, NV_PCFG + xve_rom_ctrl_r(), - xve_rom_ctrl_rom_shadow_disabled_f()); + g->ops.xve.disable_shadow_rom(g); for (i = 0; i < g->bios.size/4; i++) { u32 val = be32_to_cpu(gk20a_readl(g, 0x300000 + i*4)); @@ -878,8 +876,7 @@ static int gm206_bios_init(struct gk20a *g) g->bios.data[(i*4)+2] = (val >> 8) & 0xff; g->bios.data[(i*4)+3] = val & 0xff; } - gk20a_writel(g, NV_PCFG + xve_rom_ctrl_r(), - xve_rom_ctrl_rom_shadow_enabled_f()); + g->ops.xve.enable_shadow_rom(g); } err = gm206_bios_parse_rom(g); -- cgit v1.2.2