media: venus: vdec: Fix decoder cmd STOP issue

Fixes an issue when issuing a stop command to the controller, negating the
following firmware error.

"SFR message from FW: Exception: TID = Unknown IP = 0x3b7dc FA = 0x0
 cause = 0x6"

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index fc0a01ffb60e6511180f4e6818f10d1e5beb26dd..11a8347e5f5c81124445de01af3bf632175fd962 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_cmds.c
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
@@ -254,7 +254,7 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt,
 int pkt_session_etb_decoder(struct hfi_session_empty_buffer_compressed_pkt *pkt,
                            void *cookie, struct hfi_frame_data *in_frame)
 {
-       if (!cookie || !in_frame->device_addr)
+       if (!cookie)
                return -EINVAL;
 
        pkt->shdr.hdr.size = sizeof(*pkt);

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 61c90693d3a8c287f11e1c6cfdd4da59645ccf39..ddb7cd39424e47a745dd27da471960bcc3c1c1cd 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -515,7 +515,10 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd)
 
                fdata.buffer_type = HFI_BUFFER_INPUT;
                fdata.flags |= HFI_BUFFERFLAG_EOS;
-               fdata.device_addr = 0xdeadb000;
+               if (IS_V6(inst->core))
+                       fdata.device_addr = 0;
+               else
+                       fdata.device_addr = 0xdeadb000;
 
                ret = hfi_session_process_buf(inst, &fdata);