gpu: nvgpu: fix handling of return data in pmu messages

Irrespective generic MSG ptr, pick up data that PMU sends
as response to commands

JIRA DNVGPU-85

Change-Id: I97dd2abcd9e2a7ad7bfe1270f9905a5b69e196f3
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/1205119
Reviewed-on: http://git-master/r/1205447
(cherry picked from commit b1130124157acb2cfb4d04a0dd6ee8c4c0c830e5)
Reviewed-on: http://git-master/r/1222684
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index f64aa608..2540ab12 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -3748,21 +3748,24 @@ static int pmu_response_handle(struct pmu_gk20a *pmu,
                 if (seq->msg) {
                         if (seq->msg->hdr.size >= msg->hdr.size) {
                                 memcpy(seq->msg, msg, msg->hdr.size);
-                                if (pv->pmu_allocation_get_dmem_size(pmu,
-                                pv->get_pmu_seq_out_a_ptr(seq)) != 0) {
-                                        pmu_copy_from_dmem(pmu,
-                                        pv->pmu_allocation_get_dmem_offset(pmu,
-                                        pv->get_pmu_seq_out_a_ptr(seq)),
-                                        seq->out_payload,
-                                        pv->pmu_allocation_get_dmem_size(pmu,
-                                        pv->get_pmu_seq_out_a_ptr(seq)), 0);
-                                }
-                        } else {
+                        }  else {
                                 gk20a_err(dev_from_gk20a(g),
                                         "sequence %d msg buffer too small",
                                         seq->id);
                         }
                 }
+                if (pv->pmu_allocation_get_dmem_size(pmu,
+                pv->get_pmu_seq_out_a_ptr(seq)) != 0) {
+                  gk20a_err(dev_from_gk20a(g), "dmem offs %x size %x\n", pv->pmu_allocation_get_dmem_offset(pmu,pv->get_pmu_seq_out_a_ptr(seq)), pv->pmu_allocation_get_dmem_size(pmu,
+pv->get_pmu_seq_out_a_ptr(seq)));
+                  gk20a_err(dev_from_gk20a(g), "copying to %p \n", seq->out_payload);
+                        pmu_copy_from_dmem(pmu,
+                        pv->pmu_allocation_get_dmem_offset(pmu,
+                        pv->get_pmu_seq_out_a_ptr(seq)),
+                        seq->out_payload,
+                        pv->pmu_allocation_get_dmem_size(pmu,
+                        pv->get_pmu_seq_out_a_ptr(seq)), 0);
+                }
         } else
                 seq->callback = NULL;
         if (pv->pmu_allocation_get_dmem_size(pmu,
@@ -4584,6 +4587,7 @@ int gk20a_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd,
 
 
         seq->state = PMU_SEQ_STATE_USED;
+
         err = pmu_write_cmd(pmu, cmd, queue_id, timeout);
         if (err)
                 seq->state = PMU_SEQ_STATE_PENDING;