LinuxTV Patchwork [03/10] venus: helpers: export few helper functions

login
register
mail settings
Submitter Stanimir Varbanov
Date Jan. 17, 2019, 4:20 p.m.
Message ID <20190117162008.25217-4-stanimir.varbanov@linaro.org>
Download mbox | patch
Permalink /patch/53988/
State New
Headers show

Comments

Stanimir Varbanov - Jan. 17, 2019, 4:20 p.m.
Here we export few helper function to use them from decoder to
implement more granular control needed for stateful Codec API
compliance.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
 drivers/media/platform/qcom/venus/helpers.c | 29 ++++++++++++---------
 drivers/media/platform/qcom/venus/helpers.h |  7 +++++
 2 files changed, 24 insertions(+), 12 deletions(-)
Alexandre Courbot - Jan. 24, 2019, 8:43 a.m.
On Fri, Jan 18, 2019 at 1:21 AM Stanimir Varbanov
<stanimir.varbanov@linaro.org> wrote:
>
> Here we export few helper function to use them from decoder to
> implement more granular control needed for stateful Codec API
> compliance.
>
> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
> ---
>  drivers/media/platform/qcom/venus/helpers.c | 29 ++++++++++++---------
>  drivers/media/platform/qcom/venus/helpers.h |  7 +++++
>  2 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index 86105de81af2..f33bbfea3576 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -88,7 +88,7 @@ bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt)
>  }
>  EXPORT_SYMBOL_GPL(venus_helper_check_codec);
>
> -static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
> +int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
>  {
>         struct intbuf *buf;
>         int ret = 0;
> @@ -109,6 +109,7 @@ static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
>  fail:
>         return ret;
>  }
> +EXPORT_SYMBOL_GPL(venus_helper_queue_dpb_bufs);
>
>  int venus_helper_free_dpb_bufs(struct venus_inst *inst)
>  {
> @@ -287,7 +288,7 @@ static const unsigned int intbuf_types_4xx[] = {
>         HFI_BUFFER_INTERNAL_PERSIST_1,
>  };
>
> -static int intbufs_alloc(struct venus_inst *inst)
> +int venus_helper_intbufs_alloc(struct venus_inst *inst)
>  {
>         const unsigned int *intbuf;
>         size_t arr_sz, i;
> @@ -313,11 +314,13 @@ static int intbufs_alloc(struct venus_inst *inst)
>         intbufs_unset_buffers(inst);
>         return ret;
>  }
> +EXPORT_SYMBOL_GPL(venus_helper_intbufs_alloc);
>
> -static int intbufs_free(struct venus_inst *inst)
> +int venus_helper_intbufs_free(struct venus_inst *inst)
>  {
>         return intbufs_unset_buffers(inst);
>  }
> +EXPORT_SYMBOL_GPL(venus_helper_intbufs_free);
>
>  static u32 load_per_instance(struct venus_inst *inst)
>  {
> @@ -348,7 +351,7 @@ static u32 load_per_type(struct venus_core *core, u32 session_type)
>         return mbs_per_sec;
>  }
>
> -static int load_scale_clocks(struct venus_core *core)
> +int venus_helper_load_scale_clocks(struct venus_core *core)
>  {
>         const struct freq_tbl *table = core->res->freq_tbl;
>         unsigned int num_rows = core->res->freq_tbl_size;
> @@ -397,6 +400,7 @@ static int load_scale_clocks(struct venus_core *core)
>         dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);
>         return ret;
>  }
> +EXPORT_SYMBOL_GPL(venus_helper_load_scale_clocks);
>
>  static void fill_buffer_desc(const struct venus_buffer *buf,
>                              struct hfi_buffer_desc *bd, bool response)
> @@ -481,7 +485,7 @@ static bool is_dynamic_bufmode(struct venus_inst *inst)
>         return caps->cap_bufs_mode_dynamic;
>  }
>
> -static int session_unregister_bufs(struct venus_inst *inst)
> +int venus_helper_unregister_bufs(struct venus_inst *inst)
>  {
>         struct venus_buffer *buf, *n;
>         struct hfi_buffer_desc bd;
> @@ -498,6 +502,7 @@ static int session_unregister_bufs(struct venus_inst *inst)
>
>         return ret;
>  }
> +EXPORT_SYMBOL_GPL(venus_helper_unregister_bufs);
>
>  static int session_register_bufs(struct venus_inst *inst)
>  {
> @@ -1018,8 +1023,8 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
>         if (inst->streamon_out & inst->streamon_cap) {
>                 ret = hfi_session_stop(inst);
>                 ret |= hfi_session_unload_res(inst);
> -               ret |= session_unregister_bufs(inst);
> -               ret |= intbufs_free(inst);
> +               ret |= venus_helper_unregister_bufs(inst);
> +               ret |= venus_helper_intbufs_free(inst);
>                 ret |= hfi_session_deinit(inst);
>
>                 if (inst->session_error || core->sys_error)
> @@ -1030,7 +1035,7 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
>
>                 venus_helper_free_dpb_bufs(inst);
>
> -               load_scale_clocks(core);
> +               venus_helper_load_scale_clocks(core);
>                 INIT_LIST_HEAD(&inst->registeredbufs);
>         }
>
> @@ -1050,7 +1055,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>         struct venus_core *core = inst->core;
>         int ret;
>
> -       ret = intbufs_alloc(inst);
> +       ret = venus_helper_intbufs_alloc(inst);
>         if (ret)
>                 return ret;
>
> @@ -1058,7 +1063,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>         if (ret)
>                 goto err_bufs_free;
>
> -       load_scale_clocks(core);
> +       venus_helper_load_scale_clocks(core);
>
>         ret = hfi_session_load_res(inst);
>         if (ret)
> @@ -1079,9 +1084,9 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>  err_unload_res:
>         hfi_session_unload_res(inst);
>  err_unreg_bufs:
> -       session_unregister_bufs(inst);
> +       venus_helper_unregister_bufs(inst);
>  err_bufs_free:
> -       intbufs_free(inst);
> +       venus_helper_intbufs_free(inst);
>         return ret;
>  }
>  EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming);
> diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
> index 2475f284f396..24faae5abd93 100644
> --- a/drivers/media/platform/qcom/venus/helpers.h
> +++ b/drivers/media/platform/qcom/venus/helpers.h
> @@ -18,6 +18,7 @@
>  #include <media/videobuf2-v4l2.h>
>
>  struct venus_inst;
> +struct venus_core;
>
>  bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt);
>  struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst,
> @@ -62,4 +63,10 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst);
>  int venus_helper_free_dpb_bufs(struct venus_inst *inst);
>  int venus_helper_power_enable(struct venus_core *core, u32 session_type,
>                               bool enable);
> +int venus_helper_intbufs_alloc(struct venus_inst *inst);
> +int venus_helper_intbufs_free(struct venus_inst *inst);
> +int venus_helper_intbufs_realloc(struct venus_inst *inst);

I think this function is only declared in patch 7?



> +int venus_helper_queue_dpb_bufs(struct venus_inst *inst);
> +int venus_helper_unregister_bufs(struct venus_inst *inst);
> +int venus_helper_load_scale_clocks(struct venus_core *core);
>  #endif
> --
> 2.17.1
>
Stanimir Varbanov - Jan. 24, 2019, 8:48 a.m.
Hi Alex,

Thanks for the review!

On 1/24/19 10:43 AM, Alexandre Courbot wrote:
> On Fri, Jan 18, 2019 at 1:21 AM Stanimir Varbanov
> <stanimir.varbanov@linaro.org> wrote:
>>
>> Here we export few helper function to use them from decoder to
>> implement more granular control needed for stateful Codec API
>> compliance.
>>
>> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>> ---
>>  drivers/media/platform/qcom/venus/helpers.c | 29 ++++++++++++---------
>>  drivers/media/platform/qcom/venus/helpers.h |  7 +++++
>>  2 files changed, 24 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
>> index 86105de81af2..f33bbfea3576 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.c
>> +++ b/drivers/media/platform/qcom/venus/helpers.c
>> @@ -88,7 +88,7 @@ bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt)
>>  }
>>  EXPORT_SYMBOL_GPL(venus_helper_check_codec);
>>
>> -static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
>> +int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
>>  {
>>         struct intbuf *buf;
>>         int ret = 0;
>> @@ -109,6 +109,7 @@ static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
>>  fail:
>>         return ret;
>>  }
>> +EXPORT_SYMBOL_GPL(venus_helper_queue_dpb_bufs);
>>
>>  int venus_helper_free_dpb_bufs(struct venus_inst *inst)
>>  {
>> @@ -287,7 +288,7 @@ static const unsigned int intbuf_types_4xx[] = {
>>         HFI_BUFFER_INTERNAL_PERSIST_1,
>>  };
>>
>> -static int intbufs_alloc(struct venus_inst *inst)
>> +int venus_helper_intbufs_alloc(struct venus_inst *inst)
>>  {
>>         const unsigned int *intbuf;
>>         size_t arr_sz, i;
>> @@ -313,11 +314,13 @@ static int intbufs_alloc(struct venus_inst *inst)
>>         intbufs_unset_buffers(inst);
>>         return ret;
>>  }
>> +EXPORT_SYMBOL_GPL(venus_helper_intbufs_alloc);
>>
>> -static int intbufs_free(struct venus_inst *inst)
>> +int venus_helper_intbufs_free(struct venus_inst *inst)
>>  {
>>         return intbufs_unset_buffers(inst);
>>  }
>> +EXPORT_SYMBOL_GPL(venus_helper_intbufs_free);
>>
>>  static u32 load_per_instance(struct venus_inst *inst)
>>  {
>> @@ -348,7 +351,7 @@ static u32 load_per_type(struct venus_core *core, u32 session_type)
>>         return mbs_per_sec;
>>  }
>>
>> -static int load_scale_clocks(struct venus_core *core)
>> +int venus_helper_load_scale_clocks(struct venus_core *core)
>>  {
>>         const struct freq_tbl *table = core->res->freq_tbl;
>>         unsigned int num_rows = core->res->freq_tbl_size;
>> @@ -397,6 +400,7 @@ static int load_scale_clocks(struct venus_core *core)
>>         dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);
>>         return ret;
>>  }
>> +EXPORT_SYMBOL_GPL(venus_helper_load_scale_clocks);
>>
>>  static void fill_buffer_desc(const struct venus_buffer *buf,
>>                              struct hfi_buffer_desc *bd, bool response)
>> @@ -481,7 +485,7 @@ static bool is_dynamic_bufmode(struct venus_inst *inst)
>>         return caps->cap_bufs_mode_dynamic;
>>  }
>>
>> -static int session_unregister_bufs(struct venus_inst *inst)
>> +int venus_helper_unregister_bufs(struct venus_inst *inst)
>>  {
>>         struct venus_buffer *buf, *n;
>>         struct hfi_buffer_desc bd;
>> @@ -498,6 +502,7 @@ static int session_unregister_bufs(struct venus_inst *inst)
>>
>>         return ret;
>>  }
>> +EXPORT_SYMBOL_GPL(venus_helper_unregister_bufs);
>>
>>  static int session_register_bufs(struct venus_inst *inst)
>>  {
>> @@ -1018,8 +1023,8 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
>>         if (inst->streamon_out & inst->streamon_cap) {
>>                 ret = hfi_session_stop(inst);
>>                 ret |= hfi_session_unload_res(inst);
>> -               ret |= session_unregister_bufs(inst);
>> -               ret |= intbufs_free(inst);
>> +               ret |= venus_helper_unregister_bufs(inst);
>> +               ret |= venus_helper_intbufs_free(inst);
>>                 ret |= hfi_session_deinit(inst);
>>
>>                 if (inst->session_error || core->sys_error)
>> @@ -1030,7 +1035,7 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
>>
>>                 venus_helper_free_dpb_bufs(inst);
>>
>> -               load_scale_clocks(core);
>> +               venus_helper_load_scale_clocks(core);
>>                 INIT_LIST_HEAD(&inst->registeredbufs);
>>         }
>>
>> @@ -1050,7 +1055,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>>         struct venus_core *core = inst->core;
>>         int ret;
>>
>> -       ret = intbufs_alloc(inst);
>> +       ret = venus_helper_intbufs_alloc(inst);
>>         if (ret)
>>                 return ret;
>>
>> @@ -1058,7 +1063,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>>         if (ret)
>>                 goto err_bufs_free;
>>
>> -       load_scale_clocks(core);
>> +       venus_helper_load_scale_clocks(core);
>>
>>         ret = hfi_session_load_res(inst);
>>         if (ret)
>> @@ -1079,9 +1084,9 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
>>  err_unload_res:
>>         hfi_session_unload_res(inst);
>>  err_unreg_bufs:
>> -       session_unregister_bufs(inst);
>> +       venus_helper_unregister_bufs(inst);
>>  err_bufs_free:
>> -       intbufs_free(inst);
>> +       venus_helper_intbufs_free(inst);
>>         return ret;
>>  }
>>  EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming);
>> diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
>> index 2475f284f396..24faae5abd93 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.h
>> +++ b/drivers/media/platform/qcom/venus/helpers.h
>> @@ -18,6 +18,7 @@
>>  #include <media/videobuf2-v4l2.h>
>>
>>  struct venus_inst;
>> +struct venus_core;
>>
>>  bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt);
>>  struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst,
>> @@ -62,4 +63,10 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst);
>>  int venus_helper_free_dpb_bufs(struct venus_inst *inst);
>>  int venus_helper_power_enable(struct venus_core *core, u32 session_type,
>>                               bool enable);
>> +int venus_helper_intbufs_alloc(struct venus_inst *inst);
>> +int venus_helper_intbufs_free(struct venus_inst *inst);
>> +int venus_helper_intbufs_realloc(struct venus_inst *inst);
> 
> I think this function is only declared in patch 7?
> 

yes that is typo which I saw after sending the patches. Fixed already.

Patch

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 86105de81af2..f33bbfea3576 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -88,7 +88,7 @@  bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt)
 }
 EXPORT_SYMBOL_GPL(venus_helper_check_codec);
 
-static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
+int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
 {
 	struct intbuf *buf;
 	int ret = 0;
@@ -109,6 +109,7 @@  static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
 fail:
 	return ret;
 }
+EXPORT_SYMBOL_GPL(venus_helper_queue_dpb_bufs);
 
 int venus_helper_free_dpb_bufs(struct venus_inst *inst)
 {
@@ -287,7 +288,7 @@  static const unsigned int intbuf_types_4xx[] = {
 	HFI_BUFFER_INTERNAL_PERSIST_1,
 };
 
-static int intbufs_alloc(struct venus_inst *inst)
+int venus_helper_intbufs_alloc(struct venus_inst *inst)
 {
 	const unsigned int *intbuf;
 	size_t arr_sz, i;
@@ -313,11 +314,13 @@  static int intbufs_alloc(struct venus_inst *inst)
 	intbufs_unset_buffers(inst);
 	return ret;
 }
+EXPORT_SYMBOL_GPL(venus_helper_intbufs_alloc);
 
-static int intbufs_free(struct venus_inst *inst)
+int venus_helper_intbufs_free(struct venus_inst *inst)
 {
 	return intbufs_unset_buffers(inst);
 }
+EXPORT_SYMBOL_GPL(venus_helper_intbufs_free);
 
 static u32 load_per_instance(struct venus_inst *inst)
 {
@@ -348,7 +351,7 @@  static u32 load_per_type(struct venus_core *core, u32 session_type)
 	return mbs_per_sec;
 }
 
-static int load_scale_clocks(struct venus_core *core)
+int venus_helper_load_scale_clocks(struct venus_core *core)
 {
 	const struct freq_tbl *table = core->res->freq_tbl;
 	unsigned int num_rows = core->res->freq_tbl_size;
@@ -397,6 +400,7 @@  static int load_scale_clocks(struct venus_core *core)
 	dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);
 	return ret;
 }
+EXPORT_SYMBOL_GPL(venus_helper_load_scale_clocks);
 
 static void fill_buffer_desc(const struct venus_buffer *buf,
 			     struct hfi_buffer_desc *bd, bool response)
@@ -481,7 +485,7 @@  static bool is_dynamic_bufmode(struct venus_inst *inst)
 	return caps->cap_bufs_mode_dynamic;
 }
 
-static int session_unregister_bufs(struct venus_inst *inst)
+int venus_helper_unregister_bufs(struct venus_inst *inst)
 {
 	struct venus_buffer *buf, *n;
 	struct hfi_buffer_desc bd;
@@ -498,6 +502,7 @@  static int session_unregister_bufs(struct venus_inst *inst)
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(venus_helper_unregister_bufs);
 
 static int session_register_bufs(struct venus_inst *inst)
 {
@@ -1018,8 +1023,8 @@  void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
 	if (inst->streamon_out & inst->streamon_cap) {
 		ret = hfi_session_stop(inst);
 		ret |= hfi_session_unload_res(inst);
-		ret |= session_unregister_bufs(inst);
-		ret |= intbufs_free(inst);
+		ret |= venus_helper_unregister_bufs(inst);
+		ret |= venus_helper_intbufs_free(inst);
 		ret |= hfi_session_deinit(inst);
 
 		if (inst->session_error || core->sys_error)
@@ -1030,7 +1035,7 @@  void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
 
 		venus_helper_free_dpb_bufs(inst);
 
-		load_scale_clocks(core);
+		venus_helper_load_scale_clocks(core);
 		INIT_LIST_HEAD(&inst->registeredbufs);
 	}
 
@@ -1050,7 +1055,7 @@  int venus_helper_vb2_start_streaming(struct venus_inst *inst)
 	struct venus_core *core = inst->core;
 	int ret;
 
-	ret = intbufs_alloc(inst);
+	ret = venus_helper_intbufs_alloc(inst);
 	if (ret)
 		return ret;
 
@@ -1058,7 +1063,7 @@  int venus_helper_vb2_start_streaming(struct venus_inst *inst)
 	if (ret)
 		goto err_bufs_free;
 
-	load_scale_clocks(core);
+	venus_helper_load_scale_clocks(core);
 
 	ret = hfi_session_load_res(inst);
 	if (ret)
@@ -1079,9 +1084,9 @@  int venus_helper_vb2_start_streaming(struct venus_inst *inst)
 err_unload_res:
 	hfi_session_unload_res(inst);
 err_unreg_bufs:
-	session_unregister_bufs(inst);
+	venus_helper_unregister_bufs(inst);
 err_bufs_free:
-	intbufs_free(inst);
+	venus_helper_intbufs_free(inst);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming);
diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index 2475f284f396..24faae5abd93 100644
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -18,6 +18,7 @@ 
 #include <media/videobuf2-v4l2.h>
 
 struct venus_inst;
+struct venus_core;
 
 bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt);
 struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst,
@@ -62,4 +63,10 @@  int venus_helper_alloc_dpb_bufs(struct venus_inst *inst);
 int venus_helper_free_dpb_bufs(struct venus_inst *inst);
 int venus_helper_power_enable(struct venus_core *core, u32 session_type,
 			      bool enable);
+int venus_helper_intbufs_alloc(struct venus_inst *inst);
+int venus_helper_intbufs_free(struct venus_inst *inst);
+int venus_helper_intbufs_realloc(struct venus_inst *inst);
+int venus_helper_queue_dpb_bufs(struct venus_inst *inst);
+int venus_helper_unregister_bufs(struct venus_inst *inst);
+int venus_helper_load_scale_clocks(struct venus_core *core);
 #endif

Privacy Policy