Hi Eizan,
Thank you for your patch.
Missatge de Eizan Miyamoto <eizan@xxxxxxxxxxxx> del dia dl., 2 d’ag.
2021 a les 14:14:
>
> Without this change, the MDP components are not fully integrated into
> the runtime power management subsystem, and the MDP driver does not
> work.
>
> For each of the component device drivers to be able to call
> pm_runtime_get/put_sync() a pointer to the component's device struct
> had to be added to struct mtk_mdp_comp, set by mtk_mdp_comp_init().
>
> Note that the dev argument to mtk_mdp_comp_clock_on/off() has been
> removed. Those functions used to be called from the "master" mdp driver
> in mtk_mdp_core.c, but the component's device pointer no longer
> corresponds to the mdp master device pointer, which is not the right
> device to pass to pm_runtime_put/get_sync() which we had to add to get
> the driver to work properly.
>
> Signed-off-by: Eizan Miyamoto <eizan@xxxxxxxxxxxx>
Reviewed-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
> ---
>
> (no changes since v1)
>
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 24 +++++++++++++++----
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 6 +++--
> drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 7 +++---
> 3 files changed, 27 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> index 7a0e3acffab9..472c261b01e8 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> @@ -12,6 +12,7 @@
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> #include <soc/mediatek/smi.h>
> +#include <linux/pm_runtime.h>
>
> #include "mtk_mdp_comp.h"
> #include "mtk_mdp_core.h"
> @@ -50,14 +51,22 @@ static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = {
> };
> MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match);
>
> -int mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
> +int mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp)
> {
> int i, err, status;
>
> if (comp->larb_dev) {
> err = mtk_smi_larb_get(comp->larb_dev);
> if (err)
> - dev_err(dev, "failed to get larb, err %d.\n", err);
> + dev_err(comp->dev, "failed to get larb, err %d.\n", err);
> + }
> +
> + err = pm_runtime_get_sync(comp->dev);
> + if (err < 0) {
> + dev_err(comp->dev,
> + "failed to runtime get, err %d.\n",
> + err);
> + return err;
> }
>
> for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
> @@ -66,7 +75,7 @@ int mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
> err = clk_prepare_enable(comp->clk[i]);
> if (err) {
> status = err;
> - dev_err(dev, "failed to enable clock, err %d. i:%d\n", err, i);
> + dev_err(comp->dev, "failed to enable clock, err %d. i:%d\n", err, i);
> goto err_clk_prepare_enable;
> }
> }
> @@ -80,10 +89,12 @@ int mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
> clk_disable_unprepare(comp->clk[i]);
> }
>
> + pm_runtime_put_sync(comp->dev);
> +
> return status;
> }
>
> -void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
> +int mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp)
> {
> int i;
>
> @@ -95,6 +106,8 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
>
> if (comp->larb_dev)
> mtk_smi_larb_put(comp->larb_dev);
> +
> + return pm_runtime_put_sync(comp->dev);
> }
>
> static int mtk_mdp_comp_bind(struct device *dev, struct device *master, void *data)
> @@ -103,6 +116,7 @@ static int mtk_mdp_comp_bind(struct device *dev, struct device *master, void *da
> struct mtk_mdp_dev *mdp = data;
>
> mtk_mdp_register_component(mdp, comp);
> + pm_runtime_enable(dev);
>
> return 0;
> }
> @@ -113,6 +127,7 @@ static void mtk_mdp_comp_unbind(struct device *dev, struct device *master,
> struct mtk_mdp_comp *comp = dev_get_drvdata(dev);
> struct mtk_mdp_dev *mdp = data;
>
> + pm_runtime_disable(dev);
> mtk_mdp_unregister_component(mdp, comp);
> }
>
> @@ -132,6 +147,7 @@ int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev)
> (enum mtk_mdp_comp_type)of_device_get_match_data(dev);
>
> INIT_LIST_HEAD(&comp->node);
> + comp->dev = dev;
>
> for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
> comp->clk[i] = of_clk_get(node, i);
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> index df5fc4c94f90..f2e22e7e7c45 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> @@ -12,17 +12,19 @@
> * @node: list node to track sibing MDP components
> * @clk: clocks required for component
> * @larb_dev: SMI device required for component
> + * @dev: component's device
> */
> struct mtk_mdp_comp {
> struct list_head node;
> struct clk *clk[2];
> + struct device *dev;
> struct device *larb_dev;
> };
>
> int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev);
>
> -int mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp);
> -void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp);
> +int mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp);
> +int mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp);
>
> extern struct platform_driver mtk_mdp_component_driver;
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> index b813a822439a..714154450981 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> @@ -58,7 +58,7 @@ static int mtk_mdp_clock_on(struct mtk_mdp_dev *mdp)
> int err;
>
> list_for_each_entry(comp_node, &mdp->comp_list, node) {
> - err = mtk_mdp_comp_clock_on(dev, comp_node);
> + err = mtk_mdp_comp_clock_on(comp_node);
> if (err) {
> status = err;
> goto err_mtk_mdp_comp_clock_on;
> @@ -69,18 +69,17 @@ static int mtk_mdp_clock_on(struct mtk_mdp_dev *mdp)
>
> err_mtk_mdp_comp_clock_on:
> list_for_each_entry_continue_reverse(comp_node, &mdp->comp_list, node)
> - mtk_mdp_comp_clock_off(dev, comp_node);
> + mtk_mdp_comp_clock_off(comp_node);
>
> return status;
> }
>
> static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp)
> {
> - struct device *dev = &mdp->pdev->dev;
> struct mtk_mdp_comp *comp_node;
>
> list_for_each_entry(comp_node, &mdp->comp_list, node)
> - mtk_mdp_comp_clock_off(dev, comp_node);
> + mtk_mdp_comp_clock_off(comp_node);
> }
>
> static void mtk_mdp_wdt_worker(struct work_struct *work)
> --
> 2.32.0.554.ge1b32706d8-goog
>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
