gpu: nvgpu: Move priv_ring HAL to common

Move implementation of priv_ring HAL to common/priv_ring. Implement
two new HAL APIs to remove illegal dependencies: enable_priv_ring and
enum_ltc.

As enum_ltc can be implemented only gm20b onwards, bump gk20a
implementation to base on gm20b.

JIRA NVGPU-964

Change-Id: I160c2216132aadbcd98bb4a688aeeb2c520a9bc0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1797025
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index bd477208..c29c03f0 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -69,7 +69,6 @@ struct nvgpu_ctxsw_trace_filter;
 #include "fifo_gk20a.h"
 #include "tsg_gk20a.h"
 #include "pmu_gk20a.h"
-#include "priv_ring_gk20a.h"
 #include "therm_gk20a.h"
 #include "clk/clk.h"
 #include "perf/perf.h"
@@ -1235,9 +1234,11 @@ struct gpu_ops {
                 void (*falcon_hal_sw_init)(struct nvgpu_falcon *flcn);
         } falcon;
         struct {
+                void (*enable_priv_ring)(struct gk20a *g);
                 void (*isr)(struct gk20a *g);
                 void (*decode_error_code)(struct gk20a *g, u32 error_code);
                 void (*set_ppriv_timeout_settings)(struct gk20a *g);
+                u32 (*enum_ltc)(struct gk20a *g);
         } priv_ring;
         struct {
                 int (*check_priv_security)(struct gk20a *g);