media: venus: hfi: handle buffer output2 type as well

This adds handling of buffers of type OUTPUT2 which is needed to
support Venus 4xx version.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c
index cbc6fad05e47e310f9250075d73a3022958f6a9e..a570fdad0de0533323351ceda1db220b2702fffd 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi.c
+++ b/drivers/media/platform/qcom/venus/hfi.c
@@ -473,7 +473,8 @@ int hfi_session_process_buf(struct venus_inst *inst, struct hfi_frame_data *fd)
 
        if (fd->buffer_type == HFI_BUFFER_INPUT)
                return ops->session_etb(inst, fd);
-       else if (fd->buffer_type == HFI_BUFFER_OUTPUT)
+       else if (fd->buffer_type == HFI_BUFFER_OUTPUT ||
+                fd->buffer_type == HFI_BUFFER_OUTPUT2)
                return ops->session_ftb(inst, fd);
 
        return -EINVAL;

diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c
index 54cd41e5837c753f25503df8ca9f3322df6d20cd..c0f3bef8299f92874938a74b988b14f4cbe19692 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_msgs.c
+++ b/drivers/media/platform/qcom/venus/hfi_msgs.c
@@ -823,7 +823,8 @@ static void hfi_session_ftb_done(struct venus_core *core,
                error = HFI_ERR_SESSION_INVALID_PARAMETER;
        }
 
-       if (buffer_type != HFI_BUFFER_OUTPUT)
+       if (buffer_type != HFI_BUFFER_OUTPUT &&
+           buffer_type != HFI_BUFFER_OUTPUT2)
                goto done;
 
        if (hfi_flags & HFI_BUFFERFLAG_EOS)