From 77e2cbab237637f71367df25384164b8c936a31a Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 13 Jun 2017 15:21:56 +0530 Subject: gpu: nvgpu: reorganize PMU perfmon -Moved perfmon code from pmu_gk20a.c to "drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c" file -Moved below related methods perfmon init, start/stop sampling, load counter read/write/reset, perfmon event handler - prepend with nvgpu_ for perfmon global methods by replacing gk20a_ JURA NVGPU-56 JURA NVGPU-98 Change-Id: Idbcdf63ebd76da170e609cc401b320a42110cd7b Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1501418 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 4a1609d6..a88bc404 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h @@ -38,7 +38,7 @@ u32 gk20a_pmu_pg_feature_list(struct gk20a *g, u32 pg_engine_id); void gk20a_pmu_save_zbc(struct gk20a *g, u32 entries); -int gk20a_pmu_perfmon_enable(struct gk20a *g, bool enable); +void gk20a_pmu_init_perfmon_counter(struct gk20a *g); void gk20a_pmu_pg_idle_counter_config(struct gk20a *g, u32 pg_engine_id); @@ -51,11 +51,9 @@ int gk20a_pmu_queue_tail(struct nvgpu_pmu *pmu, struct pmu_queue *queue, u32 *tail, bool set); void gk20a_pmu_msgq_tail(struct nvgpu_pmu *pmu, u32 *tail, bool set); -int gk20a_pmu_load_norm(struct gk20a *g, u32 *load); -int gk20a_pmu_load_update(struct gk20a *g); -void gk20a_pmu_reset_load_counters(struct gk20a *g); -void gk20a_pmu_get_load_counters(struct gk20a *g, u32 *busy_cycles, - u32 *total_cycles); +u32 gk20a_pmu_read_idle_counter(struct gk20a *g, u32 counter_id); +void gk20a_pmu_reset_idle_counter(struct gk20a *g, u32 counter_id); + void gk20a_init_pmu_ops(struct gpu_ops *gops); void pmu_copy_to_dmem(struct nvgpu_pmu *pmu, @@ -81,7 +79,4 @@ int pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable); bool nvgpu_find_hex_in_string(char *strings, struct gk20a *g, u32 *hex_pos); -int nvgpu_pmu_perfmon_start_sampling(struct nvgpu_pmu *pmu); -int nvgpu_pmu_perfmon_stop_sampling(struct nvgpu_pmu *pmu); - #endif /*__PMU_GK20A_H__*/ -- cgit v1.2.2