nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: replace nvgpu_pmu_dbg with nvgpu_err/log_info in queues sources

Browse Source 
queue specific sources should use general logging interfaces like
nvgpu_err, nvgpu_log_info and not PMU specific nvgpu_pmu_dbg. With
this we can remove pmu.h inclusion in engine_mem_queue.c and
engine_fb_queue.c. This uncovers some new header inclusions
that we have to do for compilation of both these files.

More cleanup of PMU fields and related headers to follow.

JIRA NVGPU-1994

Change-Id: I728746094de85f338fcae940f10ee1731d397048
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2019415
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sagar Kamble
2019-02-14 22:48:49 +05:30
committed by mobile promotions
parent e8486f0b25
commit 285b3cc914
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue.c
View File

@@ -25,11 +25,11 @@
#include <nvgpu/types.h>
#include <nvgpu/flcnif_cmn.h>
#include <nvgpu/nvgpu_mem.h>
#include <nvgpu/pmu.h>
#include <nvgpu/string.h>
#include <nvgpu/kmem.h>
#include <nvgpu/engine_queue.h>
#include <nvgpu/engine_fb_queue.h>
#include <nvgpu/pmuif/gpmuif_cmn.h>
#include "engine_fb_queue_priv.h"
@@ -309,8 +309,8 @@ static int engine_fb_queue_prepare_write(struct nvgpu_engine_fb_queue *queue,
/* make sure there's enough free space for the write */
if (!engine_fb_queue_has_room(queue, size)) {
nvgpu_pmu_dbg(queue->g, "queue full: queue-id %d: index %d",
queue->id, queue->index);
nvgpu_log_info(queue->g, "queue full: queue-id %d: index %d",
queue->id, queue->index);
err = -EAGAIN;
goto exit;
}
@@ -517,7 +517,7 @@ void nvgpu_engine_fb_queue_free(struct nvgpu_engine_fb_queue **queue_p)
g = queue->g;
nvgpu_pmu_dbg(g, "flcn id-%d q-id %d: index %d ",
nvgpu_log_info(g, "flcn id-%d q-id %d: index %d ",
queue->flcn_id, queue->id, queue->index);
nvgpu_kfree(g, queue->fbq.work_buffer);
@@ -588,7 +588,7 @@ int nvgpu_engine_fb_queue_init(struct nvgpu_engine_fb_queue **queue_p,
goto exit;
}
nvgpu_log(g, gpu_dbg_pmu,
nvgpu_log_info(g,
"flcn id-%d q-id %d: index %d, size 0x%08x",
queue->flcn_id, queue->id, queue->index,
queue->size);

2
drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue_priv.h
View File

@@ -23,6 +23,8 @@
#ifndef NVGPU_ENGINE_FB_QUEUE_PRIV_H
#define NVGPU_ENGINE_FB_QUEUE_PRIV_H
#include <nvgpu/lock.h>
struct nvgpu_engine_fb_queue {
struct gk20a *g;
u32 flcn_id;

17
drivers/gpu/nvgpu/common/engine_queues/engine_mem_queue.c
View File

@@ -20,9 +20,14 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <nvgpu/errno.h>
#include <nvgpu/kmem.h>
#include <nvgpu/lock.h>
#include <nvgpu/pmu.h>
#include <nvgpu/log.h>
#include <nvgpu/flcnif_cmn.h>
#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
#include <nvgpu/engine_queue.h>
#include <nvgpu/engine_mem_queue.h>
#include "engine_mem_queue_priv.h"
#include "engine_dmem_queue.h"
@@ -94,7 +99,7 @@ static int engine_mem_queue_rewind(struct nvgpu_falcon *flcn,
goto exit;
} else {
queue->position += ALIGN(cmd.hdr.size, QUEUE_ALIGNMENT);
nvgpu_pmu_dbg(g, "flcn-%d queue-%d, rewinded",
nvgpu_log_info(g, "flcn-%d queue-%d, rewinded",
queue->flcn_id, queue->id);
}
}
@@ -124,7 +129,7 @@ static int engine_mem_queue_prepare_write(struct nvgpu_falcon *flcn,
/* make sure there's enough free space for the write */
if (!engine_mem_queue_has_room(queue, size, &q_rewind)) {
nvgpu_pmu_dbg(queue->g, "queue full: queue-id %d: index %d",
nvgpu_log_info(queue->g, "queue full: queue-id %d: index %d",
queue->id, queue->index);
err = -EAGAIN;
goto exit;
@@ -355,8 +360,8 @@ void nvgpu_engine_mem_queue_free(struct nvgpu_engine_mem_queue **queue_p)
g = queue->g;
nvgpu_pmu_dbg(g, "flcn id-%d q-id %d: index %d ",
queue->flcn_id, queue->id, queue->index);
nvgpu_log_info(g, "flcn id-%d q-id %d: index %d ",
queue->flcn_id, queue->id, queue->index);
/* destroy mutex */
nvgpu_mutex_destroy(&queue->mutex);
@@ -401,7 +406,7 @@ int nvgpu_engine_mem_queue_init(struct nvgpu_engine_mem_queue **queue_p,
queue->head = params.queue_head;
queue->tail = params.queue_tail;
nvgpu_log(g, gpu_dbg_pmu,
nvgpu_log_info(g,
"flcn id-%d q-id %d: index %d, offset 0x%08x, size 0x%08x",
queue->flcn_id, queue->id, queue->index,
queue->offset, queue->size);