From 7a39d8e9ce3703c61f6860a7e31beebd048a04b8 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 5 May 2022 15:52:02 -0700 Subject: [PATCH] gpu: nvgpu: hal: remove .fb.mem_unlock for ga10b .fb.mem_unlock is specific to dGPU. Jira GVSCI-9976 Signed-off-by: Richard Zhao Change-Id: Id1a52becaa5c2b0a00899c3bc92aa18058a1f97d Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2708394 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/hal/init/hal_ga10b.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/init/hal_ga10b.c b/drivers/gpu/nvgpu/hal/init/hal_ga10b.c index d3c9558f8..00d57dec0 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_ga10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_ga10b.c @@ -936,9 +936,6 @@ static const struct gops_fb ga10b_ops_fb = { #ifdef CONFIG_NVGPU_REPLAYABLE_FAULT .handle_replayable_fault = gv11b_fb_handle_replayable_mmu_fault, .mmu_invalidate_replay = gv11b_fb_mmu_invalidate_replay, -#endif -#ifdef CONFIG_NVGPU_DGPU - .mem_unlock = NULL, #endif .write_mmu_fault_buffer_lo_hi = gv11b_fb_write_mmu_fault_buffer_lo_hi, .write_mmu_fault_buffer_get = fb_gv11b_write_mmu_fault_buffer_get, @@ -1996,11 +1993,6 @@ int ga10b_init_hal(struct gk20a *g) #ifdef CONFIG_NVGPU_SIM /* SIM specific overrides for ga10b */ nvgpu_init_sim_support_ga10b(g); - if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)){ - /* Disable fb mem_unlock */ - gops->fb.mem_unlock = NULL; - } - #endif #ifdef CONFIG_NVGPU_HAL_NON_FUSA