diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/pmu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 3 |
3 files changed, 7 insertions, 6 deletions
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, | |||
193 | 193 | ||
194 | g->ops.pmu.pmu_msgq_tail(pmu, &tail, QUEUE_GET); | 194 | g->ops.pmu.pmu_msgq_tail(pmu, &tail, QUEUE_GET); |
195 | 195 | ||
196 | pmu_copy_from_dmem(pmu, tail, | 196 | nvgpu_flcn_copy_from_dmem(pmu->flcn, tail, |
197 | (u8 *)&msg->hdr, PMU_MSG_HDR_SIZE, 0); | 197 | (u8 *)&msg->hdr, PMU_MSG_HDR_SIZE, 0); |
198 | if (msg->hdr.unit_id != PMU_UNIT_INIT) { | 198 | if (msg->hdr.unit_id != PMU_UNIT_INIT) { |
199 | nvgpu_err(g, "expecting init msg"); | 199 | nvgpu_err(g, "expecting init msg"); |
200 | return -EINVAL; | 200 | return -EINVAL; |
201 | } | 201 | } |
202 | 202 | ||
203 | pmu_copy_from_dmem(pmu, tail + PMU_MSG_HDR_SIZE, | 203 | nvgpu_flcn_copy_from_dmem(pmu->flcn, tail + PMU_MSG_HDR_SIZE, |
204 | (u8 *)&msg->msg, msg->hdr.size - PMU_MSG_HDR_SIZE, 0); | 204 | (u8 *)&msg->msg, msg->hdr.size - PMU_MSG_HDR_SIZE, 0); |
205 | 205 | ||
206 | if (msg->msg.init.msg_type != PMU_INIT_MSG_TYPE_PMU_INIT) { | 206 | 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, | |||
214 | init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); | 214 | init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); |
215 | if (!pmu->gid_info.valid) { | 215 | if (!pmu->gid_info.valid) { |
216 | 216 | ||
217 | pmu_copy_from_dmem(pmu, | 217 | nvgpu_flcn_copy_from_dmem(pmu->flcn, |
218 | pv->get_pmu_init_msg_pmu_sw_mg_off(init), | 218 | pv->get_pmu_init_msg_pmu_sw_mg_off(init), |
219 | (u8 *)&gid_data, | 219 | (u8 *)&gid_data, |
220 | sizeof(struct pmu_sha1_gid_data), 0); | 220 | 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, | |||
129 | static inline void pmu_queue_read(struct nvgpu_pmu *pmu, | 129 | static inline void pmu_queue_read(struct nvgpu_pmu *pmu, |
130 | u32 offset, u8 *dst, u32 size) | 130 | u32 offset, u8 *dst, u32 size) |
131 | { | 131 | { |
132 | pmu_copy_from_dmem(pmu, offset, dst, size, 0); | 132 | nvgpu_flcn_copy_from_dmem(pmu->flcn, offset, dst, size, 0); |
133 | } | 133 | } |
134 | 134 | ||
135 | static inline void pmu_queue_write(struct nvgpu_pmu *pmu, | 135 | static inline void pmu_queue_write(struct nvgpu_pmu *pmu, |
@@ -673,7 +673,7 @@ static int pmu_response_handle(struct nvgpu_pmu *pmu, | |||
673 | } | 673 | } |
674 | if (pv->pmu_allocation_get_dmem_size(pmu, | 674 | if (pv->pmu_allocation_get_dmem_size(pmu, |
675 | pv->get_pmu_seq_out_a_ptr(seq)) != 0) { | 675 | pv->get_pmu_seq_out_a_ptr(seq)) != 0) { |
676 | pmu_copy_from_dmem(pmu, | 676 | nvgpu_flcn_copy_from_dmem(pmu->flcn, |
677 | pv->pmu_allocation_get_dmem_offset(pmu, | 677 | pv->pmu_allocation_get_dmem_offset(pmu, |
678 | pv->get_pmu_seq_out_a_ptr(seq)), | 678 | pv->get_pmu_seq_out_a_ptr(seq)), |
679 | seq->out_payload, | 679 | 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) | |||
204 | return 0; | 204 | return 0; |
205 | } | 205 | } |
206 | 206 | ||
207 | pmu_copy_from_dmem(pmu, pmu->sample_buffer, (u8 *)&load, 2, 0); | 207 | nvgpu_flcn_copy_from_dmem(pmu->flcn, pmu->sample_buffer, |
208 | (u8 *)&load, 2, 0); | ||
208 | pmu->load_shadow = load / 10; | 209 | pmu->load_shadow = load / 10; |
209 | pmu->load_avg = (((9*pmu->load_avg) + pmu->load_shadow) / 10); | 210 | pmu->load_avg = (((9*pmu->load_avg) + pmu->load_shadow) / 10); |
210 | 211 | ||