Merge tag 'v5.2-rc4' into media/master

[linux.git] / drivers / media / platform / qcom / venus / helpers.c

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 7d0017613113277841a724f3786ede23285feeee..71b06dfc6dc40d70a4f16b363801fe6ce33e90a3 100644 (file)
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -458,6 +458,13 @@ static bool is_dynamic_bufmode(struct venus_inst *inst)
        struct venus_core *core = inst->core;
        struct venus_caps *caps;
 
+       /*
+        * v4 doesn't send BUFFER_ALLOC_MODE_SUPPORTED property and supports
+        * dynamic buffer mode by default for HFI_BUFFER_OUTPUT/OUTPUT2.
+        */
+       if (IS_V4(core))
+               return true;
+
        caps = venus_caps_by_codec(core, inst->hfi_codec, inst->session_type);
        if (!caps)
                return false;