2024-03-27 18:14:29

by Konrad Dybcio

[permalink] [raw]
Subject: [PATCH v3 17/19] media: venus: pm_helpers: Commonize vdec_get()

This function can be very easily commonized between the supported gens.
Do so!

Signed-off-by: Konrad Dybcio <[email protected]>
---
drivers/media/platform/qcom/venus/pm_helpers.c | 22 ++--------------------
drivers/media/platform/qcom/venus/pm_helpers.h | 2 +-
drivers/media/platform/qcom/venus/vdec.c | 9 +++++++--
3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index ba5199d9e5c9..3818384bae10 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -125,7 +125,7 @@ static int core_clks_set_rate(struct venus_core *core, unsigned long freq)
return 0;
}

-static int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)
+int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)
{
char buf[13] = { 0 }; /* vcodecX_core\0 */

@@ -158,6 +158,7 @@ static int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)

return 0;
}
+EXPORT_SYMBOL_GPL(vcodec_clks_get);

static int vcodec_clks_enable(struct venus_core *core, u8 id)
{
@@ -345,13 +346,6 @@ vcodec_control_v3(struct venus_core *core, u32 session_type, bool enable)
writel(1, ctrl);
}

-static int vdec_get_v3(struct device *dev)
-{
- struct venus_core *core = dev_get_drvdata(dev);
-
- return vcodec_clks_get(core, dev, 0);
-}
-
static int vdec_power_v3(struct device *dev, int on)
{
struct venus_core *core = dev_get_drvdata(dev);
@@ -394,7 +388,6 @@ static int venc_power_v3(struct device *dev, int on)
}

static const struct venus_pm_ops pm_ops_v3 = {
- .vdec_get = vdec_get_v3,
.vdec_power = vdec_power_v3,
.venc_get = venc_get_v3,
.venc_power = venc_power_v3,
@@ -759,16 +752,6 @@ static int coreid_power_v4(struct venus_inst *inst, int on)
return ret;
}

-static int vdec_get_v4(struct device *dev)
-{
- struct venus_core *core = dev_get_drvdata(dev);
-
- if (!legacy_binding)
- return 0;
-
- return vcodec_clks_get(core, dev, 0);
-}
-
static void vdec_put_v4(struct device *dev)
{
struct venus_core *core = dev_get_drvdata(dev);
@@ -1107,7 +1090,6 @@ static int load_scale_v4(struct venus_inst *inst)
}

static const struct venus_pm_ops pm_ops_v4 = {
- .vdec_get = vdec_get_v4,
.vdec_put = vdec_put_v4,
.vdec_power = vdec_power_v4,
.venc_get = venc_get_v4,
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.h b/drivers/media/platform/qcom/venus/pm_helpers.h
index 7a55a55029f3..4afc57dac865 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.h
+++ b/drivers/media/platform/qcom/venus/pm_helpers.h
@@ -10,7 +10,6 @@ struct venus_core;
#define POWER_OFF 0

struct venus_pm_ops {
- int (*vdec_get)(struct device *dev);
void (*vdec_put)(struct device *dev);
int (*vdec_power)(struct device *dev, int on);

@@ -27,6 +26,7 @@ const struct venus_pm_ops *venus_pm_get(enum hfi_version version);
int venus_core_power(struct venus_core *core, int on);
void vcodec_domains_put(struct venus_core *core);
int venus_get_resources(struct venus_core *core);
+int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id);

static inline int venus_pm_load_scale(struct venus_inst *inst)
{
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 29130a9441e7..d127311100cd 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1788,8 +1788,13 @@ static int vdec_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, core);

- if (core->pm_ops->vdec_get) {
- ret = core->pm_ops->vdec_get(dev);
+ /*
+ * If the vcodec core clock is missing by now, it either doesn't exist
+ * (8916) or deprecated bindings with pre-assigned core functions and
+ * resources under the decoder node are in use.
+ */
+ if (!core->vcodec_core_clks[0]) {
+ ret = vcodec_clks_get(core, dev, 0);
if (ret)
return ret;
}

--
2.44.0



2024-04-25 12:56:44

by Dikshita Agarwal

[permalink] [raw]
Subject: Re: [PATCH v3 17/19] media: venus: pm_helpers: Commonize vdec_get()



On 3/27/2024 11:38 PM, Konrad Dybcio wrote:
> This function can be very easily commonized between the supported gens.
> Do so!
>
> Signed-off-by: Konrad Dybcio <[email protected]>
> ---
> drivers/media/platform/qcom/venus/pm_helpers.c | 22 ++--------------------
> drivers/media/platform/qcom/venus/pm_helpers.h | 2 +-
> drivers/media/platform/qcom/venus/vdec.c | 9 +++++++--
> 3 files changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
> index ba5199d9e5c9..3818384bae10 100644
> --- a/drivers/media/platform/qcom/venus/pm_helpers.c
> +++ b/drivers/media/platform/qcom/venus/pm_helpers.c
> @@ -125,7 +125,7 @@ static int core_clks_set_rate(struct venus_core *core, unsigned long freq)
> return 0;
> }
>
> -static int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)
> +int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)
> {
> char buf[13] = { 0 }; /* vcodecX_core\0 */
>
> @@ -158,6 +158,7 @@ static int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id)
>
> return 0;
> }
> +EXPORT_SYMBOL_GPL(vcodec_clks_get);
>
> static int vcodec_clks_enable(struct venus_core *core, u8 id)
> {
> @@ -345,13 +346,6 @@ vcodec_control_v3(struct venus_core *core, u32 session_type, bool enable)
> writel(1, ctrl);
> }
>
> -static int vdec_get_v3(struct device *dev)
> -{
> - struct venus_core *core = dev_get_drvdata(dev);
> -
> - return vcodec_clks_get(core, dev, 0);
> -}
> -
> static int vdec_power_v3(struct device *dev, int on)
> {
> struct venus_core *core = dev_get_drvdata(dev);
> @@ -394,7 +388,6 @@ static int venc_power_v3(struct device *dev, int on)
> }
>
> static const struct venus_pm_ops pm_ops_v3 = {
> - .vdec_get = vdec_get_v3,
> .vdec_power = vdec_power_v3,
> .venc_get = venc_get_v3,
> .venc_power = venc_power_v3,
> @@ -759,16 +752,6 @@ static int coreid_power_v4(struct venus_inst *inst, int on)
> return ret;
> }
>
> -static int vdec_get_v4(struct device *dev)
> -{
> - struct venus_core *core = dev_get_drvdata(dev);
> -
> - if (!legacy_binding)
> - return 0;
> -
> - return vcodec_clks_get(core, dev, 0);
> -}
> -
> static void vdec_put_v4(struct device *dev)
> {
> struct venus_core *core = dev_get_drvdata(dev);
> @@ -1107,7 +1090,6 @@ static int load_scale_v4(struct venus_inst *inst)
> }
>
> static const struct venus_pm_ops pm_ops_v4 = {
> - .vdec_get = vdec_get_v4,
> .vdec_put = vdec_put_v4,
> .vdec_power = vdec_power_v4,
> .venc_get = venc_get_v4,
> diff --git a/drivers/media/platform/qcom/venus/pm_helpers.h b/drivers/media/platform/qcom/venus/pm_helpers.h
> index 7a55a55029f3..4afc57dac865 100644
> --- a/drivers/media/platform/qcom/venus/pm_helpers.h
> +++ b/drivers/media/platform/qcom/venus/pm_helpers.h
> @@ -10,7 +10,6 @@ struct venus_core;
> #define POWER_OFF 0
>
> struct venus_pm_ops {
> - int (*vdec_get)(struct device *dev);
> void (*vdec_put)(struct device *dev);
> int (*vdec_power)(struct device *dev, int on);
>
> @@ -27,6 +26,7 @@ const struct venus_pm_ops *venus_pm_get(enum hfi_version version);
> int venus_core_power(struct venus_core *core, int on);
> void vcodec_domains_put(struct venus_core *core);
> int venus_get_resources(struct venus_core *core);
> +int vcodec_clks_get(struct venus_core *core, struct device *dev, u8 id);
>
> static inline int venus_pm_load_scale(struct venus_inst *inst)
> {
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index 29130a9441e7..d127311100cd 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -1788,8 +1788,13 @@ static int vdec_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, core);
>
> - if (core->pm_ops->vdec_get) {
> - ret = core->pm_ops->vdec_get(dev);
> + /*
> + * If the vcodec core clock is missing by now, it either doesn't exist
> + * (8916) or deprecated bindings with pre-assigned core functions and
> + * resources under the decoder node are in use.
> + */
This comment is not very clear to me, could you please elaborate more on
"deprecated bindings with pre-assigned core functions and
resources under the decoder node are in use"
> + if (!core->vcodec_core_clks[0]) {
> + ret = vcodec_clks_get(core, dev, 0);
> if (ret)
> return ret;
> }
>
Calling vcodec_clks_get directly instead of vdec_get op looks fine to me,
but this depends on the previous patch, so will need some changes.

Thanks,
Dikshita