From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Aniket Masule <amasule@codeaurora.org>, linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
vgarodia@codeaurora.org
Subject: Re: [PATCH v3 4/4] media: venus: Update core selection
Date: Mon, 1 Jul 2019 16:58:43 +0300 [thread overview]
Message-ID: <ac2170e6-6925-bfaf-523d-9e412d9ac1a7@linaro.org> (raw)
In-Reply-To: <1561480044-11834-5-git-send-email-amasule@codeaurora.org>
Hi,
On 6/25/19 7:27 PM, Aniket Masule wrote:
> Present core assignment is static. Introduced load balancing
> across the cores. Load on earch core is calculated and core
> with minimum load is assigned to given instance.
>
> Signed-off-by: Aniket Masule <amasule@codeaurora.org>
> ---
> drivers/media/platform/qcom/venus/helpers.c | 52 +++++++++++++++++++++++++----
> drivers/media/platform/qcom/venus/helpers.h | 2 +-
> drivers/media/platform/qcom/venus/vdec.c | 2 +-
> drivers/media/platform/qcom/venus/venc.c | 2 +-
> 4 files changed, 49 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
> index b79e83a..ef35fd8 100644
> --- a/drivers/media/platform/qcom/venus/helpers.c
> +++ b/drivers/media/platform/qcom/venus/helpers.c
> @@ -498,6 +498,16 @@ static int load_scale_clocks(struct venus_inst *inst)
> return scale_clocks(inst);
> }
>
> +int set_core_usage(struct venus_inst *inst, u32 usage)
> +{
> + const u32 ptype = HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE;
> + struct hfi_videocores_usage_type cu;
> +
> + cu.video_core_enable_mask = usage;
> +
> + return hfi_session_set_property(inst, ptype, &cu);
> +}
> +
> static void fill_buffer_desc(const struct venus_buffer *buf,
> struct hfi_buffer_desc *bd, bool response)
> {
> @@ -801,19 +811,49 @@ int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode)
> }
> EXPORT_SYMBOL_GPL(venus_helper_set_work_mode);
>
> -int venus_helper_set_core_usage(struct venus_inst *inst, u32 usage)
> +int venus_helper_set_core(struct venus_inst *inst)
> {
> - const u32 ptype = HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE;
> - struct hfi_videocores_usage_type cu;
> + struct venus_core *core = inst->core;
> + u32 min_core_id = 0, core0_load = 0, core1_load = 0;
the same comment, please use the same counting scheme as for VIDC_CORE_ID_
> + unsigned long min_load, max_freq, cur_inst_load;
> + u32 cores_max;
> + int ret;
>
> if (!IS_V4(inst->core))
> return 0;
>
> - cu.video_core_enable_mask = usage;
> + core0_load = load_per_core(core, VIDC_CORE_ID_1);
> + core1_load = load_per_core(core, VIDC_CORE_ID_2);
>
> - return hfi_session_set_property(inst, ptype, &cu);
> + min_core_id = core0_load < core1_load ? VIDC_CORE_ID_1 : VIDC_CORE_ID_2;
> + min_load = min(core0_load, core1_load);
> + cores_max = core_num_max(inst);
> +
> + if (cores_max < VIDC_CORE_ID_2) {
> + min_core_id = VIDC_CORE_ID_1;
> + min_load = core0_load;
> + }
> +
> + cur_inst_load = load_per_instance(inst) *
> + inst->clk_data.codec_freq_data->vpp_freq;
> + max_freq = core->res->freq_tbl[0].freq;
> +
> + if ((cur_inst_load + min_load) > max_freq) {
> + dev_warn(core->dev, "HW is overloaded, needed: %lu max: %lu\n",
> + cur_inst_load, max_freq);
> + return -EINVAL;
> + }
> +
> + ret = set_core_usage(inst, min_core_id);
> +
please, delete this blank line
> + if (ret)
> + return ret;
> +
> + inst->clk_data.core_id = min_core_id;
> +
> + return 0;
> }
> -EXPORT_SYMBOL_GPL(venus_helper_set_core_usage);
> +EXPORT_SYMBOL_GPL(venus_helper_set_core);
>
> int venus_helper_init_codec_freq_data(struct venus_inst *inst)
> {
> diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
> index 2c13245..1034111 100644
> --- a/drivers/media/platform/qcom/venus/helpers.h
> +++ b/drivers/media/platform/qcom/venus/helpers.h
> @@ -42,7 +42,7 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,
> u32 buftype);
> int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode);
> int venus_helper_init_codec_freq_data(struct venus_inst *inst);
> -int venus_helper_set_core_usage(struct venus_inst *inst, u32 usage);
> +int venus_helper_set_core(struct venus_inst *inst);
> int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
> unsigned int output_bufs,
> unsigned int output2_bufs);
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index d037f80..620e060 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -551,7 +551,7 @@ static int vdec_output_conf(struct venus_inst *inst)
> if (ret)
> return ret;
>
> - ret = venus_helper_set_core_usage(inst, VIDC_CORE_ID_1);
> + ret = venus_helper_set_core(inst);
> if (ret)
> return ret;
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index cdddc82..28e76cc 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -660,7 +660,7 @@ static int venc_set_properties(struct venus_inst *inst)
> if (ret)
> return ret;
>
> - ret = venus_helper_set_core_usage(inst, VIDC_CORE_ID_2);
> + ret = venus_helper_set_core(inst);
> if (ret)
> return ret;
>
>
--
regards,
Stan
next prev parent reply other threads:[~2019-07-01 13:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 16:27 [PATCH v3 0/4] media: venus: Update clock scaling and core selection Aniket Masule
2019-06-25 16:27 ` [PATCH v3 1/4] media: venus: Add codec data table Aniket Masule
2019-07-01 11:43 ` Stanimir Varbanov
2019-07-02 4:55 ` amasule
2019-06-25 16:27 ` [PATCH v3 2/4] media: venus: Update clock scaling Aniket Masule
2019-07-01 13:11 ` Stanimir Varbanov
2019-07-02 4:59 ` amasule
2019-06-25 16:27 ` [PATCH v3 3/4] media: venus: Add interface for load per core Aniket Masule
2019-07-01 13:55 ` Stanimir Varbanov
2019-06-25 16:27 ` [PATCH v3 4/4] media: venus: Update core selection Aniket Masule
2019-07-01 13:58 ` Stanimir Varbanov [this message]
2019-07-02 5:01 ` amasule
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ac2170e6-6925-bfaf-523d-9e412d9ac1a7@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=amasule@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=vgarodia@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).