From 411865675521ee379c3b9016b8c455b412c1f6eb Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Wed, 21 Jun 2017 22:54:28 +0530 Subject: gpu: nvgpu: use nvgpu_flcn_copy_from_dmem() - replace usage of pmu_copy_from_dmem() with nvgpu_flcn_copy_from_dmem() - delete nvgpu_flcn_copy_from_dmem() JIRA NVGPU-99 Change-Id: If0919187078f95a165d6a152f180549ac121beaa Signed-off-by: Mahantesh Kumbar Reviewed-on: https://git-master/r/1506534 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/pmu.c | 6 +++--- drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 4 ++-- drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index 35422e0d..eb1c83fb 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c @@ -193,14 +193,14 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, g->ops.pmu.pmu_msgq_tail(pmu, &tail, QUEUE_GET); - pmu_copy_from_dmem(pmu, tail, + nvgpu_flcn_copy_from_dmem(pmu->flcn, tail, (u8 *)&msg->hdr, PMU_MSG_HDR_SIZE, 0); if (msg->hdr.unit_id != PMU_UNIT_INIT) { nvgpu_err(g, "expecting init msg"); return -EINVAL; } - pmu_copy_from_dmem(pmu, tail + PMU_MSG_HDR_SIZE, + nvgpu_flcn_copy_from_dmem(pmu->flcn, tail + PMU_MSG_HDR_SIZE, (u8 *)&msg->msg, msg->hdr.size - PMU_MSG_HDR_SIZE, 0); if (msg->msg.init.msg_type != PMU_INIT_MSG_TYPE_PMU_INIT) { @@ -214,7 +214,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); if (!pmu->gid_info.valid) { - pmu_copy_from_dmem(pmu, + nvgpu_flcn_copy_from_dmem(pmu->flcn, pv->get_pmu_init_msg_pmu_sw_mg_off(init), (u8 *)&gid_data, sizeof(struct pmu_sha1_gid_data), 0); diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index e45a6182..93687c7b 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c @@ -129,7 +129,7 @@ static int pmu_queue_tail(struct nvgpu_pmu *pmu, struct pmu_queue *queue, static inline void pmu_queue_read(struct nvgpu_pmu *pmu, u32 offset, u8 *dst, u32 size) { - pmu_copy_from_dmem(pmu, offset, dst, size, 0); + nvgpu_flcn_copy_from_dmem(pmu->flcn, offset, dst, size, 0); } static inline void pmu_queue_write(struct nvgpu_pmu *pmu, @@ -673,7 +673,7 @@ static int pmu_response_handle(struct nvgpu_pmu *pmu, } if (pv->pmu_allocation_get_dmem_size(pmu, pv->get_pmu_seq_out_a_ptr(seq)) != 0) { - pmu_copy_from_dmem(pmu, + nvgpu_flcn_copy_from_dmem(pmu->flcn, pv->pmu_allocation_get_dmem_offset(pmu, pv->get_pmu_seq_out_a_ptr(seq)), seq->out_payload, diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c index 9f236aa8..750906ce 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c @@ -204,7 +204,8 @@ int nvgpu_pmu_load_update(struct gk20a *g) return 0; } - pmu_copy_from_dmem(pmu, pmu->sample_buffer, (u8 *)&load, 2, 0); + nvgpu_flcn_copy_from_dmem(pmu->flcn, pmu->sample_buffer, + (u8 *)&load, 2, 0); pmu->load_shadow = load / 10; pmu->load_avg = (((9*pmu->load_avg) + pmu->load_shadow) / 10); -- cgit v1.2.2