Revert "gpu: nvgpu: gv11b: fix for gfx preemption"

This reverts commit caf168e33ec12ff6f0ed90fd4aa7654c09eaa553.

Might be causing an intermittency in quill-c03 graphics submit. Super
weird since the only change that seems like it could affect it is the
header file update but that seems rather safe.

Bug 2044830

Change-Id: I14809d4945744193b9c2d7729ae8a516eb3e0b21
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1634349
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Timo Alho <talho@nvidia.com>
Tested-by: Timo Alho <talho@nvidia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 9156d9b8..ff26f694 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -1,7 +1,7 @@
 /*
  * GV11B Tegra HAL interface
  *
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, 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"),
@@ -290,7 +290,7 @@ static const struct gpu_ops gv11b_ops = {
                 .alloc_gr_ctx = gr_gp10b_alloc_gr_ctx,
                 .free_gr_ctx = gr_gp10b_free_gr_ctx,
                 .update_ctxsw_preemption_mode =
-                        gr_gv11b_update_ctxsw_preemption_mode,
+                        gr_gp10b_update_ctxsw_preemption_mode,
                 .dump_gr_regs = gr_gv11b_dump_gr_status_regs,
                 .update_pc_sampling = gr_gm20b_update_pc_sampling,
                 .get_fbp_en_mask = gr_gm20b_get_fbp_en_mask,
@@ -365,7 +365,7 @@ static const struct gpu_ops gv11b_ops = {
                 .update_boosted_ctx = gr_gp10b_update_boosted_ctx,
                 .set_bes_crop_debug3 = gr_gp10b_set_bes_crop_debug3,
                 .create_gr_sysfs = gr_gv11b_create_sysfs,
-                .set_ctxsw_preemption_mode = gr_gv11b_set_ctxsw_preemption_mode,
+                .set_ctxsw_preemption_mode = gr_gp10b_set_ctxsw_preemption_mode,
                 .is_etpc_addr = gv11b_gr_pri_is_etpc_addr,
                 .egpc_etpc_priv_addr_table = gv11b_gr_egpc_etpc_priv_addr_table,
                 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception,