diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-04-18 22:39:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-09 21:26:04 -0400 |
commit | dd739fcb039d51606e9a5454ec0aab17bcb01965 (patch) | |
tree | 806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/perf/vfe_equ.c | |
parent | 7e66f2a63d4855e763fa768047dfc32f6f96b771 (diff) |
gpu: nvgpu: Remove gk20a_dbg* functions
Switch all logging to nvgpu_log*(). gk20a_dbg* macros are
intentionally left there because of use from other repositories.
Because the new functions do not work without a pointer to struct
gk20a, and piping it just for logging is excessive, some log messages
are deleted.
Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1704148
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/perf/vfe_equ.c')
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_equ.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c index 2493061e..8321d98d 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/perf/vfe_equ.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -59,7 +59,7 @@ static u32 _vfe_equs_pmudata_instget(struct gk20a *g, | |||
59 | struct nv_pmu_perf_vfe_equ_boardobj_grp_set *pgrp_set = | 59 | struct nv_pmu_perf_vfe_equ_boardobj_grp_set *pgrp_set = |
60 | (struct nv_pmu_perf_vfe_equ_boardobj_grp_set *)pmuboardobjgrp; | 60 | (struct nv_pmu_perf_vfe_equ_boardobj_grp_set *)pmuboardobjgrp; |
61 | 61 | ||
62 | gk20a_dbg_info(""); | 62 | nvgpu_log_info(g, " "); |
63 | 63 | ||
64 | /* check whether pmuboardobjgrp has a valid boardobj in index */ | 64 | /* check whether pmuboardobjgrp has a valid boardobj in index */ |
65 | if (idx >= CTRL_BOARDOBJGRP_E255_MAX_OBJECTS) | 65 | if (idx >= CTRL_BOARDOBJGRP_E255_MAX_OBJECTS) |
@@ -67,7 +67,7 @@ static u32 _vfe_equs_pmudata_instget(struct gk20a *g, | |||
67 | 67 | ||
68 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) | 68 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) |
69 | &pgrp_set->objects[idx].data.board_obj; | 69 | &pgrp_set->objects[idx].data.board_obj; |
70 | gk20a_dbg_info(" Done"); | 70 | nvgpu_log_info(g, " Done"); |
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
73 | 73 | ||
@@ -77,7 +77,7 @@ u32 vfe_equ_sw_setup(struct gk20a *g) | |||
77 | struct boardobjgrp *pboardobjgrp = NULL; | 77 | struct boardobjgrp *pboardobjgrp = NULL; |
78 | struct vfe_equs *pvfeequobjs; | 78 | struct vfe_equs *pvfeequobjs; |
79 | 79 | ||
80 | gk20a_dbg_info(""); | 80 | nvgpu_log_info(g, " "); |
81 | 81 | ||
82 | status = boardobjgrpconstruct_e255(g, &g->perf_pmu.vfe_equobjs.super); | 82 | status = boardobjgrpconstruct_e255(g, &g->perf_pmu.vfe_equobjs.super); |
83 | if (status) { | 83 | if (status) { |
@@ -109,7 +109,7 @@ u32 vfe_equ_sw_setup(struct gk20a *g) | |||
109 | goto done; | 109 | goto done; |
110 | 110 | ||
111 | done: | 111 | done: |
112 | gk20a_dbg_info(" done status %x", status); | 112 | nvgpu_log_info(g, " done status %x", status); |
113 | return status; | 113 | return status; |
114 | } | 114 | } |
115 | 115 | ||
@@ -118,7 +118,7 @@ u32 vfe_equ_pmu_setup(struct gk20a *g) | |||
118 | u32 status; | 118 | u32 status; |
119 | struct boardobjgrp *pboardobjgrp = NULL; | 119 | struct boardobjgrp *pboardobjgrp = NULL; |
120 | 120 | ||
121 | gk20a_dbg_info(""); | 121 | nvgpu_log_info(g, " "); |
122 | 122 | ||
123 | pboardobjgrp = &g->perf_pmu.vfe_equobjs.super.super; | 123 | pboardobjgrp = &g->perf_pmu.vfe_equobjs.super.super; |
124 | 124 | ||
@@ -127,7 +127,7 @@ u32 vfe_equ_pmu_setup(struct gk20a *g) | |||
127 | 127 | ||
128 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); | 128 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); |
129 | 129 | ||
130 | gk20a_dbg_info("Done"); | 130 | nvgpu_log_info(g, "Done"); |
131 | return status; | 131 | return status; |
132 | } | 132 | } |
133 | 133 | ||
@@ -152,7 +152,7 @@ static u32 devinit_get_vfe_equ_table(struct gk20a *g, | |||
152 | struct vfe_equ_quadratic quadratic; | 152 | struct vfe_equ_quadratic quadratic; |
153 | } equ_data; | 153 | } equ_data; |
154 | 154 | ||
155 | gk20a_dbg_info(""); | 155 | nvgpu_log_info(g, " "); |
156 | 156 | ||
157 | vfeequs_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, | 157 | vfeequs_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
158 | g->bios.perf_token, | 158 | g->bios.perf_token, |
@@ -325,7 +325,7 @@ static u32 devinit_get_vfe_equ_table(struct gk20a *g, | |||
325 | } | 325 | } |
326 | } | 326 | } |
327 | done: | 327 | done: |
328 | gk20a_dbg_info(" done status %x", status); | 328 | nvgpu_log_info(g, " done status %x", status); |
329 | return status; | 329 | return status; |
330 | } | 330 | } |
331 | 331 | ||
@@ -337,7 +337,7 @@ static u32 _vfe_equ_pmudatainit_super(struct gk20a *g, | |||
337 | struct vfe_equ *pvfe_equ; | 337 | struct vfe_equ *pvfe_equ; |
338 | struct nv_pmu_vfe_equ *pset; | 338 | struct nv_pmu_vfe_equ *pset; |
339 | 339 | ||
340 | gk20a_dbg_info(""); | 340 | nvgpu_log_info(g, " "); |
341 | 341 | ||
342 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); | 342 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); |
343 | if (status != 0) | 343 | if (status != 0) |
@@ -392,7 +392,7 @@ static u32 _vfe_equ_pmudatainit_compare(struct gk20a *g, | |||
392 | struct vfe_equ_compare *pvfe_equ_compare; | 392 | struct vfe_equ_compare *pvfe_equ_compare; |
393 | struct nv_pmu_vfe_equ_compare *pset; | 393 | struct nv_pmu_vfe_equ_compare *pset; |
394 | 394 | ||
395 | gk20a_dbg_info(""); | 395 | nvgpu_log_info(g, " "); |
396 | 396 | ||
397 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); | 397 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); |
398 | if (status != 0) | 398 | if (status != 0) |
@@ -451,7 +451,7 @@ static u32 _vfe_equ_pmudatainit_minmax(struct gk20a *g, | |||
451 | struct vfe_equ_minmax *pvfe_equ_minmax; | 451 | struct vfe_equ_minmax *pvfe_equ_minmax; |
452 | struct nv_pmu_vfe_equ_minmax *pset; | 452 | struct nv_pmu_vfe_equ_minmax *pset; |
453 | 453 | ||
454 | gk20a_dbg_info(""); | 454 | nvgpu_log_info(g, " "); |
455 | 455 | ||
456 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); | 456 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); |
457 | if (status != 0) | 457 | if (status != 0) |
@@ -507,7 +507,7 @@ static u32 _vfe_equ_pmudatainit_quadratic(struct gk20a *g, | |||
507 | struct nv_pmu_vfe_equ_quadratic *pset; | 507 | struct nv_pmu_vfe_equ_quadratic *pset; |
508 | u32 i; | 508 | u32 i; |
509 | 509 | ||
510 | gk20a_dbg_info(""); | 510 | nvgpu_log_info(g, " "); |
511 | 511 | ||
512 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); | 512 | status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); |
513 | if (status != 0) | 513 | if (status != 0) |
@@ -558,7 +558,7 @@ static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) | |||
558 | struct boardobj *board_obj_ptr = NULL; | 558 | struct boardobj *board_obj_ptr = NULL; |
559 | u32 status; | 559 | u32 status; |
560 | 560 | ||
561 | gk20a_dbg_info(""); | 561 | nvgpu_log_info(g, " "); |
562 | 562 | ||
563 | switch (BOARDOBJ_GET_TYPE(pargs)) { | 563 | switch (BOARDOBJ_GET_TYPE(pargs)) { |
564 | case CTRL_PERF_VFE_EQU_TYPE_COMPARE: | 564 | case CTRL_PERF_VFE_EQU_TYPE_COMPARE: |
@@ -584,7 +584,7 @@ static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) | |||
584 | if (status) | 584 | if (status) |
585 | return NULL; | 585 | return NULL; |
586 | 586 | ||
587 | gk20a_dbg_info(" Done"); | 587 | nvgpu_log_info(g, " Done"); |
588 | 588 | ||
589 | return (struct vfe_equ *)board_obj_ptr; | 589 | return (struct vfe_equ *)board_obj_ptr; |
590 | } | 590 | } |