Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp758445pxb; Fri, 28 Jan 2022 09:19:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkutitFLCl6Xp5qTSyHnpLp+yqwrt8sx47YdmtoOnsdN5vJABAw5BsPRBOkjY+WbrxHZc1 X-Received: by 2002:a17:90a:8909:: with SMTP id u9mr10902327pjn.9.1643390387179; Fri, 28 Jan 2022 09:19:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390387; cv=none; d=google.com; s=arc-20160816; b=U0rKk0DQoHHqfTJBPNun6yd783PFVJQhq9Mbgsq25DapFLoyvxtOb0hBBrX3z5XrLR FpwyZYaH4ThBRUIoTsBrGy+LKGF8YUzv5JWkUBALlI2dp4IT0/lQEJuzvJoRGpq+yep5 QaHqBtnbkczjbRc4ZeiVx3nkuxRhz+FD2e8HJSWCQeL/XTjDNQa1lnO6G5R2WPK5XfRi 0MfHtf3sIbUPp2ukCo0Qr7bbIntZLTX09DtgVTS7SwxT5OzqOmdZunOy3Z+svLnXtBl0 fKNcX30arFXTUJsHpimVZZtyB7AdjwMomXYr42JkBqfT/l7PTcHIwmLdaWdAPer0nLjo yvcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m9a8zcSwcpladoTNvW+Mx8bO+UU4CpffIWXmtXe0Ndo=; b=ky5Q+CFJZLkKaKU5i6zYqzEqdLnTKM5MbhT8Vs2gpqhmstAs4hO0AgE/aGY7pLjOyc 9Wg/tSyNc5dToABd0Lj7oHl1+CMUyHrdsi175j+8sGDSqpi4zHoeW956BRgXNFqJfptF OW9wz3ugb8YFozA9cz3h70vinH6fwzwlx3wqNpf7AcGDKbQl9+B1GepW8Vb+SHkehbfE vRaFAvo/XxZ08jOY0VZuKqe5YLjRDhQ9sxvCLUrS/t3mX9OPHWIvxzK50G+bwpYumZNG SUIYQ/5yK5MIZ+sWr2znYL0Qz7WypMbZcLNnV5ImeBnHzlbxo26hVrKQIWgYtUKxud5A yn9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=X5ktv8lL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ot14si3251491pjb.25.2022.01.28.09.19.34; Fri, 28 Jan 2022 09:19:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=X5ktv8lL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343792AbiA0UCi (ORCPT + 99 others); Thu, 27 Jan 2022 15:02:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343725AbiA0UCR (ORCPT ); Thu, 27 Jan 2022 15:02:17 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30DE7C06174A for ; Thu, 27 Jan 2022 12:02:16 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id d15-20020a17090a110f00b001b4e7d27474so4146471pja.2 for ; Thu, 27 Jan 2022 12:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m9a8zcSwcpladoTNvW+Mx8bO+UU4CpffIWXmtXe0Ndo=; b=X5ktv8lLpf+IELlZ3g3ez+/s2Mg1qsxtLoUl7oUREs6OxUk7pRfz3KrRj4laK6MZsJ rlPqF8raj9oFQiIAKqoNkqum2trbRgRBfAeKg2Mj8IQZD1i5xV+LgsrXqEpNEjAAYJgO LjwLv5Bx+fNXpHWa33uWdM5Vv444CSvs1Hz3Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m9a8zcSwcpladoTNvW+Mx8bO+UU4CpffIWXmtXe0Ndo=; b=zjYz7BhtIdyNQ55T7Porm/BXb6QQ1FIMl/QrabAxsXTEl9CoESplEog9rog/cjypeb T+PPhqdIq3MQEXBvy8GFta9TRlpnO6gzkZwNPNgHX82L+p5sWzPtyFueXYzAWncvUzub Wh86ypwXl2oHphguErAducBoaUP/iGI2ZVywjYvVggTLZbxLTvZOZG734k5ZWnIUXoTN 0y7eGcvG3uoQZFSa4qf3uXmrgyABBpCGc63iJLvNgAmdKrAtrUTyO4a1eX8vVFklEIOC Jjr5bkb9iFaku0ZfPydf8fXjbLjv7nht8c98CwRF/Ire3xOXfXHiCFdRgZHcP7CIfIU2 nT2g== X-Gm-Message-State: AOAM5317BEziCRSTNEYyjaREEBo1drb0gvwNrSrzdeTNAW7xOF/wZ10N EuYpXuojGZXKhnOa+PHWpMJV05WNXubbcg== X-Received: by 2002:a17:90b:4f4e:: with SMTP id pj14mr5917665pjb.220.1643313735720; Thu, 27 Jan 2022 12:02:15 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:201:9246:1838:3243:3071]) by smtp.gmail.com with ESMTPSA id k21sm6561190pff.33.2022.01.27.12.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:15 -0800 (PST) From: Stephen Boyd To: Greg Kroah-Hartman , Douglas Anderson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan , Linus Walleij Subject: [PATCH v6 16/35] drm/mcde: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:22 -0800 Message-Id: <20220127200141.1295328-17-swboyd@chromium.org> X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog In-Reply-To: <20220127200141.1295328-1-swboyd@chromium.org> References: <20220127200141.1295328-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use an aggregate driver instead of component ops so that we can get proper driver probe ordering of the aggregate device with respect to all the component devices that make up the aggregate device. Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Tested-by: Linus Walleij Signed-off-by: Stephen Boyd --- drivers/gpu/drm/mcde/mcde_drv.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index 5b5afc6aaf8e..b8479355844e 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -215,8 +215,9 @@ static const struct drm_driver mcde_drm_driver = { DRM_GEM_CMA_DRIVER_OPS, }; -static int mcde_drm_bind(struct device *dev) +static int mcde_drm_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm = dev_get_drvdata(dev); int ret; @@ -247,8 +248,9 @@ static int mcde_drm_bind(struct device *dev) return ret; } -static void mcde_drm_unbind(struct device *dev) +static void mcde_drm_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm = dev_get_drvdata(dev); drm_dev_unregister(drm); @@ -256,9 +258,13 @@ static void mcde_drm_unbind(struct device *dev) component_unbind_all(drm->dev, drm); } -static const struct component_master_ops mcde_drm_comp_ops = { - .bind = mcde_drm_bind, - .unbind = mcde_drm_unbind, +static struct aggregate_driver mcde_drm_comp_driver = { + .probe = mcde_drm_bind, + .remove = mcde_drm_unbind, + .driver = { + .name = "mcde_drm", + .owner = THIS_MODULE, + }, }; static struct platform_driver *const mcde_component_drivers[] = { @@ -419,7 +425,7 @@ static int mcde_probe(struct platform_device *pdev) * Perform an invasive reset of the MCDE and all blocks by * cutting the power to the subsystem, then bring it back up * later when we enable the display as a result of - * component_master_add_with_match(). + * component_aggregate_register(). */ ret = regulator_disable(mcde->epod); if (ret) { @@ -429,8 +435,7 @@ static int mcde_probe(struct platform_device *pdev) /* Wait 50 ms so we are sure we cut the power */ usleep_range(50000, 70000); - ret = component_master_add_with_match(&pdev->dev, &mcde_drm_comp_ops, - match); + ret = component_aggregate_register(&pdev->dev, &mcde_drm_comp_driver, match); if (ret) { dev_err(dev, "failed to add component master\n"); /* @@ -459,7 +464,7 @@ static int mcde_remove(struct platform_device *pdev) struct drm_device *drm = platform_get_drvdata(pdev); struct mcde *mcde = to_mcde(drm); - component_master_del(&pdev->dev, &mcde_drm_comp_ops); + component_aggregate_unregister(&pdev->dev, &mcde_drm_comp_driver); clk_disable_unprepare(mcde->mcde_clk); regulator_disable(mcde->vana); regulator_disable(mcde->epod); -- https://chromeos.dev