| Message ID | 20200506184018.v2.2.I87cf35a058328c780bd3b8b2191209a5011b7016@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Refactor MDP driver and add dummy component driver | expand |
Hi Eizan, Thank you for the patch. Missatge de Eizan Miyamoto <eizan@chromium.org> del dia dc., 6 de maig 2020 a les 10:42: > > 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@chromium.org> > --- > > Changes in v2: Ah, I guess this change log corresponds to the first patch. > - remove empty mtk_mdp_comp_init > - update documentation for enum mtk_mdp_comp_type > - remove comma after last element of mtk_mdp_comp_driver_dt_match > > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 22 ++++++++++++++----- > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 6 +++-- > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 6 ++--- > 3 files changed, 23 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > index 5b4d482df778..228c58f92c8c 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > @@ -15,6 +15,7 @@ > #include <linux/of_platform.h> > #include <soc/mediatek/smi.h> > #include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > > #include "mtk_mdp_comp.h" > #include "mtk_mdp_core.h" > @@ -53,7 +54,7 @@ static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = { > }; > MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match); > > -void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp) > { > int i, err; > > @@ -62,25 +63,31 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > if (err) { > enum mtk_mdp_comp_type comp_type = > (enum mtk_mdp_comp_type) > - of_device_get_match_data(dev); > - dev_err(dev, > + of_device_get_match_data(comp->dev); > + dev_err(comp->dev, > "failed to get larb, err %d. type:%d\n", > err, comp_type); > } > } > > + err = pm_runtime_get_sync(comp->dev); > + if (err < 0) > + dev_err(comp->dev, > + "failed to runtime get, err %d.\n", > + err); Should you really ignore this error? If that's the case I'd just call pm_runtime_get_sync() without adding the logic to just print an error message. > + > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > if (IS_ERR(comp->clk[i])) > continue; > err = clk_prepare_enable(comp->clk[i]); > if (err) > - dev_err(dev, > + dev_err(comp->dev, > "failed to enable clock, err %d. i:%d\n", > err, i); Although ignoring errors seems to be a common pattern in this file and I know you did not introduce this. > } > } > > -void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) > +void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp) > { > int i; > > @@ -92,6 +99,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); > + > + pm_runtime_put_sync(comp->dev); > } > > static int mtk_mdp_comp_bind(struct device *dev, struct device *master, > @@ -101,6 +110,7 @@ static int mtk_mdp_comp_bind(struct device *dev, struct device *master, > struct mtk_mdp_dev *mdp = data; > > mtk_mdp_register_component(mdp, comp); > + pm_runtime_enable(dev); > > return 0; > } > @@ -111,6 +121,7 @@ static void mtk_mdp_comp_unbind(struct device *dev, struct device *master, > struct mtk_mdp_dev *mdp = data; > struct mtk_mdp_comp *comp = dev_get_drvdata(dev); > > + pm_runtime_disable(dev); > mtk_mdp_unregister_component(mdp, comp); > } > > @@ -129,6 +140,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 b5a18fe567aa..de158d3712f6 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 *larb_dev; > + struct device *dev; > }; > > int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev); > > -void 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); > +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp); > +void 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 539a7942e3cb..133d107aa4e6 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > @@ -52,20 +52,18 @@ MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids); > > static void mtk_mdp_clock_on(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_on(dev, comp_node); > + mtk_mdp_comp_clock_on(comp_node); > } > > 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.26.2.526.g744177e7f7-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Thu, May 7, 2020 at 3:07 AM Enric Balletbo Serra <eballetbo@gmail.com> wrote: > > Hi Eizan, > > Thank you for the patch. > > Missatge de Eizan Miyamoto <eizan@chromium.org> del dia dc., 6 de maig > 2020 a les 10:42: > > > > 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@chromium.org> > > --- > > > > Changes in v2: > > Ah, I guess this change log corresponds to the first patch. > > > - remove empty mtk_mdp_comp_init > > - update documentation for enum mtk_mdp_comp_type > > - remove comma after last element of mtk_mdp_comp_driver_dt_match > > > > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 22 ++++++++++++++----- > > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 6 +++-- > > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 6 ++--- > > 3 files changed, 23 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > > index 5b4d482df778..228c58f92c8c 100644 > > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > > @@ -15,6 +15,7 @@ > > #include <linux/of_platform.h> > > #include <soc/mediatek/smi.h> > > #include <linux/platform_device.h> > > +#include <linux/pm_runtime.h> > > > > #include "mtk_mdp_comp.h" > > #include "mtk_mdp_core.h" > > @@ -53,7 +54,7 @@ static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = { > > }; > > MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match); > > > > -void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > > +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp) > > { > > int i, err; > > > > @@ -62,25 +63,31 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > > if (err) { > > enum mtk_mdp_comp_type comp_type = > > (enum mtk_mdp_comp_type) > > - of_device_get_match_data(dev); > > - dev_err(dev, > > + of_device_get_match_data(comp->dev); > > + dev_err(comp->dev, > > "failed to get larb, err %d. type:%d\n", > > err, comp_type); > > } > > } > > > > + err = pm_runtime_get_sync(comp->dev); > > + if (err < 0) > > + dev_err(comp->dev, > > + "failed to runtime get, err %d.\n", > > + err); > > Should you really ignore this error? If that's the case I'd just call > pm_runtime_get_sync() without adding the logic to just print an error > message. This is mostly consistent with style elsewhere, e.g., in mtk_mdp_m2m.c mtk_mdp_m2m_start_streaming and mtk_mdp_m2m_stop_streaming. > > > + > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > > if (IS_ERR(comp->clk[i])) > > continue; > > err = clk_prepare_enable(comp->clk[i]); > > if (err) > > - dev_err(dev, > > + dev_err(comp->dev, > > "failed to enable clock, err %d. i:%d\n", > > err, i); > > Although ignoring errors seems to be a common pattern in this file and > I know you did not introduce this. Maybe the issue is that since no action is taken, logging at the 'error' log level is not the right thing? IOW, should it be changed to an informational message instead? Nevertheless, I think we should defer these changes to a follow-up patch instead. > > > } > > } > > > > -void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) > > +void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp) > > { > > int i; > > > > @@ -92,6 +99,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); > > + > > + pm_runtime_put_sync(comp->dev); > > } > > > > static int mtk_mdp_comp_bind(struct device *dev, struct device *master, > > @@ -101,6 +110,7 @@ static int mtk_mdp_comp_bind(struct device *dev, struct device *master, > > struct mtk_mdp_dev *mdp = data; > > > > mtk_mdp_register_component(mdp, comp); > > + pm_runtime_enable(dev); > > > > return 0; > > } > > @@ -111,6 +121,7 @@ static void mtk_mdp_comp_unbind(struct device *dev, struct device *master, > > struct mtk_mdp_dev *mdp = data; > > struct mtk_mdp_comp *comp = dev_get_drvdata(dev); > > > > + pm_runtime_disable(dev); > > mtk_mdp_unregister_component(mdp, comp); > > } > > > > @@ -129,6 +140,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 b5a18fe567aa..de158d3712f6 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 *larb_dev; > > + struct device *dev; > > }; > > > > int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev); > > > > -void 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); > > +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp); > > +void 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 539a7942e3cb..133d107aa4e6 100644 > > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > > @@ -52,20 +52,18 @@ MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids); > > > > static void mtk_mdp_clock_on(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_on(dev, comp_node); > > + mtk_mdp_comp_clock_on(comp_node); > > } > > > > 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.26.2.526.g744177e7f7-goog > > > > > > _______________________________________________ > > Linux-mediatek mailing list > > Linux-mediatek@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c index 5b4d482df778..228c58f92c8c 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c @@ -15,6 +15,7 @@ #include <linux/of_platform.h> #include <soc/mediatek/smi.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include "mtk_mdp_comp.h" #include "mtk_mdp_core.h" @@ -53,7 +54,7 @@ static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = { }; MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match); -void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp) { int i, err; @@ -62,25 +63,31 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) if (err) { enum mtk_mdp_comp_type comp_type = (enum mtk_mdp_comp_type) - of_device_get_match_data(dev); - dev_err(dev, + of_device_get_match_data(comp->dev); + dev_err(comp->dev, "failed to get larb, err %d. type:%d\n", err, comp_type); } } + err = pm_runtime_get_sync(comp->dev); + if (err < 0) + dev_err(comp->dev, + "failed to runtime get, err %d.\n", + err); + for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { if (IS_ERR(comp->clk[i])) continue; err = clk_prepare_enable(comp->clk[i]); if (err) - dev_err(dev, + dev_err(comp->dev, "failed to enable clock, err %d. i:%d\n", err, i); } } -void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) +void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp) { int i; @@ -92,6 +99,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); + + pm_runtime_put_sync(comp->dev); } static int mtk_mdp_comp_bind(struct device *dev, struct device *master, @@ -101,6 +110,7 @@ static int mtk_mdp_comp_bind(struct device *dev, struct device *master, struct mtk_mdp_dev *mdp = data; mtk_mdp_register_component(mdp, comp); + pm_runtime_enable(dev); return 0; } @@ -111,6 +121,7 @@ static void mtk_mdp_comp_unbind(struct device *dev, struct device *master, struct mtk_mdp_dev *mdp = data; struct mtk_mdp_comp *comp = dev_get_drvdata(dev); + pm_runtime_disable(dev); mtk_mdp_unregister_component(mdp, comp); } @@ -129,6 +140,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 b5a18fe567aa..de158d3712f6 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 *larb_dev; + struct device *dev; }; int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev); -void 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); +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp); +void 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 539a7942e3cb..133d107aa4e6 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -52,20 +52,18 @@ MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids); static void mtk_mdp_clock_on(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_on(dev, comp_node); + mtk_mdp_comp_clock_on(comp_node); } 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)
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@chromium.org> --- Changes in v2: - remove empty mtk_mdp_comp_init - update documentation for enum mtk_mdp_comp_type - remove comma after last element of mtk_mdp_comp_driver_dt_match drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 22 ++++++++++++++----- drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 6 +++-- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 6 ++--- 3 files changed, 23 insertions(+), 11 deletions(-)