From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32650C4724C for ; Wed, 6 May 2020 16:54:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08C4D20936 for ; Wed, 6 May 2020 16:54:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X70m0HNB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729973AbgEFQyk (ORCPT ); Wed, 6 May 2020 12:54:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729341AbgEFQyj (ORCPT ); Wed, 6 May 2020 12:54:39 -0400 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68781C061A0F; Wed, 6 May 2020 09:54:39 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id c10so2724975qka.4; Wed, 06 May 2020 09:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DC+0GmQNgY97QhRFbS23ewOmIbsCdpL79dUscuMquyA=; b=X70m0HNBQmfyo+W7dL9sv+s/euBuwGMJrtjZKgAt+mAYMHGjKtNnRbllx6U2lh36m9 hbkMia6Ep2lvNJzsSjli9QNGCLxeAIX9/p7+QexK977Y3KzFTEEBu1MJs4jhtDNnSP16 ++rMnTKw3Qo73CWoUPYmRzDo8lAaWAXD8uj0tQmpScjDOvq1Q5KZTx8yJdfQ86bLqEcA f3WiEqwJ9HuBIV2pQ5mPmzPfbx56Qu2D4ljoeZ9NF2JPCD0MyqbasOha6eLwY3tZzZra /HLi2RNowqrCFerMH9tfpfEzm9QwcCTJrP+S5CiadqTeb1P7SU7MgkAkX3AfG9g4hnk/ M04g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DC+0GmQNgY97QhRFbS23ewOmIbsCdpL79dUscuMquyA=; b=C931La7jCWuetOdcit0ioyT+zFmyRsj8M7Yxsa+PcB9AOOcGtKpuuD6dniuSm5kpwf 92Qe8gQcSBzx/bnjtrh68p8+FNa1OC+iyqdkdh7sCOMsKon4uRsHQ4oF25vNc8XYvyE3 1M9aOqyovSRp0r9YA0PWIhvgrCHcmej0SVDwvKMXb64P5ztbB6ziL1Hm6URhHfbggoTB 4UFz956CDyXpjsmE3l80yK5fEKyGGHjTEqzX9FrD9qfjYDEcVkfYy00wbh1tGSJsUsc+ u1AlsFT7ckzLTETGKazlcxeUVnPMVGxq+icyvavuuAmeRgimonxNB4FpKw/AKafSgXUm 3Chg== X-Gm-Message-State: AGi0PuaFa5tDvjevV4rP+oew1YUfvJOVQe/6LqhTru9eKRog8BipvBcH N8Uk4JUMtVRaDsFv8VA4gBPHl5dxElWiJK2kS2A= X-Google-Smtp-Source: APiQypJ7kwkNbgYOBsXYezvSWqkQozNZaH2AkRBNJTdTFoL2sKT7s9rZKBBYpvjD+dDP/mhhE/sPlBwfgEGm21NGN/4= X-Received: by 2002:a37:a193:: with SMTP id k141mr2982375qke.147.1588784078132; Wed, 06 May 2020 09:54:38 -0700 (PDT) MIME-Version: 1.0 References: <20200506084039.249977-1-eizan@chromium.org> <20200506184018.v2.1.I27dac0775ba64deff6a91837f39bfba83dccdf84@changeid> In-Reply-To: <20200506184018.v2.1.I27dac0775ba64deff6a91837f39bfba83dccdf84@changeid> From: Enric Balletbo Serra Date: Wed, 6 May 2020 18:54:25 +0200 Message-ID: Subject: Re: [PATCH v2 1/2] [media] mtk-mdp: add driver to probe mdp components To: Eizan Miyamoto Cc: LKML , Andrew-CT Chen , Minghsiu Tsai , Houlong Wei , "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , Mauro Carvalho Chehab , Linux ARM , linux-media@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Eizan, Thank you for the patch. Missatge de Eizan Miyamoto del dia dc., 6 de maig 2020 a les 10:41: > > Broadly, this patch (1) adds a driver for various MTK MDP components to > go alongside the main MTK MDP driver, and (2) hooks them all together > using the component framework. > > (1) Up until now, the MTK MDP driver controls 8 devices in the device > tree on its own. When running tests for the hardware video decoder, we > found that the iommus and LARBs were not being properly configured. To > configure them, a driver for each be added to mtk_mdp_comp so that > mtk_iommu_add_device() can (eventually) be called from dma_configure() > inside really_probe(). > > (2) The integration into the component framework allows us to defer the > registration with the v4l2 subsystem until all the MDP-related devices > have been probed, so that the relevant device node does not become > available until initialization of all the components is complete. > > Some notes about how the component framework has been integrated: > > - The driver for the rdma0 component serves double duty as the "master" > (aggregate) driver as well as a component driver. This is a non-ideal > compromise until a better solution is developed. This device is > differentiated from the rest by checking for a "mediatek,vpu" property > in the device node. > > - The list of mdp components remains hard-coded as mtk_mdp_comp_dt_ids[] > in mtk_mdp_core.c, and as mtk_mdp_comp_driver_dt_match[] in > mtk_mdp_comp.c. This unfortunate duplication of information is > addressed in a following patch in this series. > > - The component driver calls component_add() for each device that is > probed. > > - In mtk_mdp_probe (the "master" device), we scan the device tree for > any matching nodes against mtk_mdp_comp_dt_ids, and add component > matches for them. The match criteria is a matching device node > pointer. > > - When the set of components devices that have been probed corresponds > with the list that is generated by the "master", the callback to > mtk_mdp_master_bind() is made, which then calls the component bind > functions. > > - Inside mtk_mdp_master_bind(), once all the component bind functions > have been called, we can then register our device to the v4l2 > subsystem. > > - The call to pm_runtime_enable() in the master device is called after > all the components have been registered by their bind() functions > called by mtk_mtp_master_bind(). As a result, the list of components > will not change while power management callbacks mtk_mdp_suspend()/ > resume() are accessing the list of components. > > Signed-off-by: Eizan Miyamoto > --- > > Changes in v2: None > Not really true :-) > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 150 +++++++++++++-- > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 26 +-- > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 176 +++++++++++++----- > drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 1 + > 4 files changed, 263 insertions(+), 90 deletions(-) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > index 362fff924aef..5b4d482df778 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > @@ -5,14 +5,53 @@ > */ > > #include > +#include > #include > -#include > +#include > #include > +#include > +#include > +#include > #include > #include > +#include > > #include "mtk_mdp_comp.h" > - > +#include "mtk_mdp_core.h" > + > +/** > + * enum mtk_mdp_comp_type - the MDP component > + * @MTK_MDP_RDMA: Read DMA > + * @MTK_MDP_RSZ: Reszer > + * @MTK_MDP_WDMA: Write DMA > + * @MTK_MDP_WROT: Write DMA with rotation > + * @MTK_MDP_COMP_TYPE_MAX: Placeholder for num elems in this enum > + */ > +enum mtk_mdp_comp_type { > + MTK_MDP_RDMA, > + MTK_MDP_RSZ, > + MTK_MDP_WDMA, > + MTK_MDP_WROT, > + MTK_MDP_COMP_TYPE_MAX, > +}; > + > +static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = { > + { > + .compatible = "mediatek,mt8173-mdp-rdma", > + .data = (void *)MTK_MDP_RDMA > + }, { > + .compatible = "mediatek,mt8173-mdp-rsz", > + .data = (void *)MTK_MDP_RSZ > + }, { > + .compatible = "mediatek,mt8173-mdp-wdma", > + .data = (void *)MTK_MDP_WDMA > + }, { > + .compatible = "mediatek,mt8173-mdp-wrot", > + .data = (void *)MTK_MDP_WROT > + }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match); > > void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > { > @@ -20,10 +59,14 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > > if (comp->larb_dev) { > err = mtk_smi_larb_get(comp->larb_dev); > - if (err) > + if (err) { > + enum mtk_mdp_comp_type comp_type = > + (enum mtk_mdp_comp_type) > + of_device_get_match_data(dev); > dev_err(dev, > "failed to get larb, err %d. type:%d\n", > - err, comp->type); > + err, comp_type); > + } > } > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > @@ -32,8 +75,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > err = clk_prepare_enable(comp->clk[i]); > if (err) > dev_err(dev, > - "failed to enable clock, err %d. type:%d i:%d\n", > - err, comp->type, i); > + "failed to enable clock, err %d. i:%d\n", > + err, i); > } > } > > @@ -51,16 +94,41 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) > mtk_smi_larb_put(comp->larb_dev); > } > > -int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > - struct mtk_mdp_comp *comp, > - enum mtk_mdp_comp_type comp_type) > +static int mtk_mdp_comp_bind(struct device *dev, struct device *master, > + void *data) > +{ > + struct mtk_mdp_comp *comp = dev_get_drvdata(dev); > + struct mtk_mdp_dev *mdp = data; > + > + mtk_mdp_register_component(mdp, comp); > + > + return 0; > +} > + > +static void mtk_mdp_comp_unbind(struct device *dev, struct device *master, > + void *data) > +{ > + struct mtk_mdp_dev *mdp = data; > + struct mtk_mdp_comp *comp = dev_get_drvdata(dev); > + > + mtk_mdp_unregister_component(mdp, comp); > +} > + > +static const struct component_ops mtk_mdp_component_ops = { > + .bind = mtk_mdp_comp_bind, > + .unbind = mtk_mdp_comp_unbind, > +}; > + > +int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev) > { > struct device_node *larb_node; > struct platform_device *larb_pdev; > int i; > + struct device_node *node = dev->of_node; > + enum mtk_mdp_comp_type comp_type = > + (enum mtk_mdp_comp_type)of_device_get_match_data(dev); > > - comp->dev_node = of_node_get(node); > - comp->type = comp_type; > + INIT_LIST_HEAD(&comp->node); > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > comp->clk[i] = of_clk_get(node, i); > @@ -72,15 +140,15 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > } > > /* Only RDMA needs two clocks */ > - if (comp->type != MTK_MDP_RDMA) > + if (comp_type != MTK_MDP_RDMA) > break; > } > > /* Only DMA capable components need the LARB property */ > comp->larb_dev = NULL; > - if (comp->type != MTK_MDP_RDMA && > - comp->type != MTK_MDP_WDMA && > - comp->type != MTK_MDP_WROT) > + if (comp_type != MTK_MDP_RDMA && > + comp_type != MTK_MDP_WDMA && > + comp_type != MTK_MDP_WROT) > return 0; > > larb_node = of_parse_phandle(node, "mediatek,larb", 0); > @@ -103,7 +171,55 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > return 0; > } > > -void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp) > +static int mtk_mdp_comp_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *vpu_node; > + int status; > + struct mtk_mdp_comp *comp; > + > + vpu_node = of_parse_phandle(dev->of_node, "mediatek,vpu", 0); > + if (vpu_node) { > + of_node_put(vpu_node); > + /* > + * The device tree node with a mediatek,vpu property is deemed > + * the MDP "master" device, we don't want to add a component > + * for it in this function because the initialization for the > + * master is done elsewhere. > + */ > + dev_info(dev, "vpu node found, not probing\n"); Could you explain a bit more this? When this can happen? I am wondering if you are trying to solve a non-existing problem upstream. > + return -ENODEV; > + } > + > + comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); > + if (!comp) > + return -ENOMEM; > + > + status = mtk_mdp_comp_init(comp, dev); > + if (status) { > + dev_err(dev, "Failed to initialize component: %d\n", status); > + return status; > + } > + > + dev_set_drvdata(dev, comp); > + > + return component_add(dev, &mtk_mdp_component_ops); > +} > + > +static int mtk_mdp_comp_remove(struct platform_device *pdev) > { > - of_node_put(comp->dev_node); > + struct device *dev = &pdev->dev; > + > + component_del(dev, &mtk_mdp_component_ops); > + return 0; > } > + > +struct platform_driver mtk_mdp_component_driver = { > + .probe = mtk_mdp_comp_probe, > + .remove = mtk_mdp_comp_remove, > + .driver = { > + .name = "mediatek-mdp-comp", > + .owner = THIS_MODULE, > + .of_match_table = mtk_mdp_comp_driver_dt_match, > + }, > +}; > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > index 1bf0242cce46..b5a18fe567aa 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > @@ -7,43 +7,23 @@ > #ifndef __MTK_MDP_COMP_H__ > #define __MTK_MDP_COMP_H__ > > -/** > - * enum mtk_mdp_comp_type - the MDP component > - * @MTK_MDP_RDMA: Read DMA > - * @MTK_MDP_RSZ: Riszer > - * @MTK_MDP_WDMA: Write DMA > - * @MTK_MDP_WROT: Write DMA with rotation > - */ > -enum mtk_mdp_comp_type { > - MTK_MDP_RDMA, > - MTK_MDP_RSZ, > - MTK_MDP_WDMA, > - MTK_MDP_WROT, > - MTK_MDP_COMP_TYPE_MAX, > -}; > - > /** > * struct mtk_mdp_comp - the MDP's function component data > * @node: list node to track sibing MDP components > - * @dev_node: component device node > * @clk: clocks required for component > * @larb_dev: SMI device required for component > - * @type: component type > */ > struct mtk_mdp_comp { > struct list_head node; > - struct device_node *dev_node; > struct clk *clk[2]; > struct device *larb_dev; > - enum mtk_mdp_comp_type type; > }; > > -int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > - struct mtk_mdp_comp *comp, > - enum mtk_mdp_comp_type comp_type); > -void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp); > +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); > > +extern struct platform_driver mtk_mdp_component_driver; > > #endif /* __MTK_MDP_COMP_H__ */ > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > index acbc5a01ae4c..539a7942e3cb 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > @@ -6,6 +6,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -19,6 +20,7 @@ > #include > #include > > +#include "mtk_mdp_comp.h" > #include "mtk_mdp_core.h" > #include "mtk_mdp_m2m.h" > #include "mtk_vpu.h" > @@ -32,16 +34,12 @@ module_param(mtk_mdp_dbg_level, int, 0644); > static const struct of_device_id mtk_mdp_comp_dt_ids[] = { > { > .compatible = "mediatek,mt8173-mdp-rdma", > - .data = (void *)MTK_MDP_RDMA > }, { > .compatible = "mediatek,mt8173-mdp-rsz", > - .data = (void *)MTK_MDP_RSZ > }, { > .compatible = "mediatek,mt8173-mdp-wdma", > - .data = (void *)MTK_MDP_WDMA > }, { > .compatible = "mediatek,mt8173-mdp-wrot", > - .data = (void *)MTK_MDP_WROT > }, > { }, > }; > @@ -91,6 +89,64 @@ static void mtk_mdp_reset_handler(void *priv) > queue_work(mdp->wdt_wq, &mdp->wdt_work); > } > > +static int compare_of(struct device *dev, void *data) > +{ > + return dev->of_node == data; > +} > + > +static void release_of(struct device *dev, void *data) > +{ > + of_node_put(data); > +} > + > +static int mtk_mdp_master_bind(struct device *dev) > +{ > + int status; > + struct mtk_mdp_dev *mdp = dev_get_drvdata(dev); > + > + mtk_mdp_register_component(mdp, &mdp->comp_self); > + > + status = component_bind_all(dev, mdp); > + if (status) { > + dev_err(dev, "Failed to bind all components: %d\n", status); > + goto err_component_bind_all; > + } > + > + status = mtk_mdp_register_m2m_device(mdp); > + if (status) { > + dev_err(dev, "Failed to register m2m device: %d\n", status); > + v4l2_err(&mdp->v4l2_dev, "Failed to init mem2mem device\n"); > + goto err_mtk_mdp_register_m2m_device; > + } > + > + pm_runtime_enable(dev); > + > + return 0; > + > +err_mtk_mdp_register_m2m_device: > + component_unbind_all(dev, mdp); > + > +err_component_bind_all: > + mtk_mdp_unregister_component(mdp, &mdp->comp_self); > + > + return status; > +} > + > +static void mtk_mdp_master_unbind(struct device *dev) > +{ > + struct mtk_mdp_dev *mdp = dev_get_drvdata(dev); > + > + pm_runtime_disable(dev); > + mtk_mdp_unregister_m2m_device(mdp); > + component_unbind_all(dev, mdp); > + mtk_mdp_unregister_component(mdp, &mdp->comp_self); > +} > + > +static const struct component_master_ops mtk_mdp_com_ops = { > + .bind = mtk_mdp_master_bind, > + .unbind = mtk_mdp_master_unbind, > +}; > + > void mtk_mdp_register_component(struct mtk_mdp_dev *mdp, > struct mtk_mdp_comp *comp) > { > @@ -108,8 +164,8 @@ static int mtk_mdp_probe(struct platform_device *pdev) > struct mtk_mdp_dev *mdp; > struct device *dev = &pdev->dev; > struct device_node *node, *parent; > - struct mtk_mdp_comp *comp, *comp_temp; > - int ret = 0; > + int i, ret = 0; > + struct component_match *match = NULL; > > mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL); > if (!mdp) > @@ -134,37 +190,43 @@ static int mtk_mdp_probe(struct platform_device *pdev) > } > > /* Iterate over sibling MDP function blocks */ > + i = 0; > for_each_child_of_node(parent, node) { > - const struct of_device_id *of_id; > - enum mtk_mdp_comp_type comp_type; > + struct platform_device *pdev; > > - of_id = of_match_node(mtk_mdp_comp_dt_ids, node); > - if (!of_id) > + if (!of_match_node(mtk_mdp_comp_dt_ids, node)) > continue; > > - if (!of_device_is_available(node)) { > - dev_err(dev, "Skipping disabled component %pOF\n", > - node); > + if (!of_device_is_available(node)) > continue; > - } > - > - comp_type = (enum mtk_mdp_comp_type)of_id->data; > > - > - comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); > - if (!comp) { > - ret = -ENOMEM; > - of_node_put(node); > - goto err_comp; > + pdev = of_find_device_by_node(node); > + if (!pdev) { > + dev_warn(dev, "Unable to find comp device %s\n", > + node->full_name); > + continue; > } > > - ret = mtk_mdp_comp_init(dev, node, comp, comp_type); > - if (ret) { > - of_node_put(node); > - goto err_comp; > + /* > + * Do not add add a match for my own (rdma0) device node. > + * I will be managing it directly instead using comp_self. > + */ > + if (&pdev->dev != dev) { > + dev_dbg(dev, "adding match %d for: %pOF\n", i++, node); > + component_match_add_release(dev, &match, release_of, > + compare_of, > + of_node_get(node)); > } > + } > > - mtk_mdp_register_component(mdp, comp); > + /* > + * Create a component for myself so that clocks can be toggled in > + * clock_on(). > + */ > + ret = mtk_mdp_comp_init(&mdp->comp_self, dev); > + if (ret) { > + dev_err(dev, "Failed to initialize component\n"); > + goto err_comp; > } > > mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME); > @@ -189,18 +251,12 @@ static int mtk_mdp_probe(struct platform_device *pdev) > goto err_dev_register; > } > > - ret = mtk_mdp_register_m2m_device(mdp); > - if (ret) { > - v4l2_err(&mdp->v4l2_dev, "Failed to init mem2mem device\n"); > - goto err_m2m_register; > - } > - > mdp->vpu_dev = vpu_get_plat_device(pdev); > ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, > VPU_RST_MDP); > if (ret) { > dev_err(&pdev->dev, "Failed to register reset handler\n"); > - goto err_m2m_register; > + goto err_wdt_reg; > } > > platform_set_drvdata(pdev, mdp); > @@ -208,15 +264,25 @@ static int mtk_mdp_probe(struct platform_device *pdev) > ret = vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); > if (ret) { > dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n"); > - goto err_m2m_register; > + goto err_set_max_seg_size; > + } > + > + ret = component_master_add_with_match(dev, &mtk_mdp_com_ops, match); > + if (ret) { > + dev_err(dev, "Component master add failed\n"); > + goto err_component_master_add; > } > > - pm_runtime_enable(dev); > dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id); > > return 0; > > -err_m2m_register: > +err_component_master_add: > + vb2_dma_contig_clear_max_seg_size(&pdev->dev); > + > +err_set_max_seg_size: > + > +err_wdt_reg: No need for two labels here, rework the above goto logic. > v4l2_device_unregister(&mdp->v4l2_dev); > > err_dev_register: > @@ -228,11 +294,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) > err_alloc_job_wq: > > err_comp: > - list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) { > - mtk_mdp_unregister_component(mdp, comp); > - mtk_mdp_comp_deinit(dev, comp); > - } > - > dev_dbg(dev, "err %d\n", ret); > return ret; > } > @@ -240,11 +301,10 @@ static int mtk_mdp_probe(struct platform_device *pdev) > static int mtk_mdp_remove(struct platform_device *pdev) > { > struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev); > - struct mtk_mdp_comp *comp, *comp_temp; > > - pm_runtime_disable(&pdev->dev); > + component_master_del(&pdev->dev, &mtk_mdp_com_ops); > + > vb2_dma_contig_clear_max_seg_size(&pdev->dev); > - mtk_mdp_unregister_m2m_device(mdp); > v4l2_device_unregister(&mdp->v4l2_dev); > > flush_workqueue(mdp->wdt_wq); > @@ -253,10 +313,8 @@ static int mtk_mdp_remove(struct platform_device *pdev) > flush_workqueue(mdp->job_wq); > destroy_workqueue(mdp->job_wq); > > - list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) { > - mtk_mdp_unregister_component(mdp, comp); > - mtk_mdp_comp_deinit(&pdev->dev, comp); > - } > + if (!list_empty(&mdp->comp_list)) > + dev_err(&pdev->dev, "not all components removed\n"); > > dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); > return 0; > @@ -311,7 +369,25 @@ static struct platform_driver mtk_mdp_driver = { > } > }; > > -module_platform_driver(mtk_mdp_driver); > +static struct platform_driver * const mtk_mdp_drivers[] = { > + &mtk_mdp_driver, > + &mtk_mdp_component_driver, > +}; > + > +static int __init mtk_mdp_init(void) > +{ > + return platform_register_drivers(mtk_mdp_drivers, > + ARRAY_SIZE(mtk_mdp_drivers)); > +} > + > +static void __exit mtk_mdp_exit(void) > +{ > + platform_unregister_drivers(mtk_mdp_drivers, > + ARRAY_SIZE(mtk_mdp_drivers)); > +} > + > +module_init(mtk_mdp_init); > +module_exit(mtk_mdp_exit); > > MODULE_AUTHOR("Houlong Wei "); > MODULE_DESCRIPTION("Mediatek image processor driver"); > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mtk-mdp/mtk_mdp_core.h > index a7da14b97077..230f531400ca 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.h > @@ -155,6 +155,7 @@ struct mtk_mdp_dev { > struct mtk_mdp_variant *variant; > u16 id; > struct list_head comp_list; > + struct mtk_mdp_comp comp_self; > struct v4l2_m2m_dev *m2m_dev; > struct list_head ctx_list; > struct video_device *vdev; > -- > 2.26.2.526.g744177e7f7-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek