Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp757859pxb; Fri, 28 Jan 2022 09:19:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJQCYhjtcSNsqe2DUF9kKFs+eDej7FFoGE6RYGOHfPGxuXJue7sIgDNPKaogUZxQioH7cI X-Received: by 2002:a17:902:ac97:: with SMTP id h23mr9876317plr.82.1643390346073; Fri, 28 Jan 2022 09:19:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390346; cv=none; d=google.com; s=arc-20160816; b=WqsRREndT4Uh2+ycIL9AcWw64gWbvL8UCWHJWGWBcKzIqDNdKfLMkpXNdknin2bf3Z +hxFy4CDtbyYI5WM6nKtfonSZWTMEwhXgyGdi3O581bjDDA0hcGvY6nVyTH+ypaSm4ZG zbHGjmDkLubuJJiBOlQ5e+q5OVgjmw462kuaUKqHOCTZWkeYK8XRUK9QpfWkOLKzABwp xy3euPC5LZegCK24S4Xh98fj8iD9mZdMo1VUBB3d7Mdxg9UyVdvqO8SRQA4oiyl9se6C Xuz4SE8xa8AuBp4qcanivsyS0AOMU6adfvL1rWH5kEdicOFzNeTfKwuFJBqrFl4Ra7eB jTLg== 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=cGCYteteinr61zPnRrp4oGl0a47ZYXq3HmBJU43ZKkM=; b=ZisL/gSfMEOsz67nmO6UzwHf2EKVkbTellQWe5AvoWxI5V2Kyy4LwVaTUpmDDCnheH WRUTh+4hmFy/lgqJW12IE4OCAg+2b1xIP77OLKwoCxx/aF10U+Ta5z9N0PWhoIM7my5M e83kUR+jpfIUalpHBX/09Chlqy5ZyKGFPhpyrpnEKlU5+ftuKt0K1S2Oiuz2EGzsDqoT 9rK4nAAIt3cKFKEQomEN94FuHFqzkgvTTgYY+mXtQ/+bHkvB3+nLD5qcbyXXCUdgXOcQ VdGFdOSrtoXFQZXeoWiRWC2oL9Zvdgc3JRQMEX95GF3gET31bhpttLc09j9uGr7KNmA0 fDiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=k1sf94So; 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 d126si5871615pgc.502.2022.01.28.09.18.53; Fri, 28 Jan 2022 09:19:06 -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=k1sf94So; 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 S1343956AbiA0UCp (ORCPT + 99 others); Thu, 27 Jan 2022 15:02:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343756AbiA0UCW (ORCPT ); Thu, 27 Jan 2022 15:02:22 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCEE7C06175C for ; Thu, 27 Jan 2022 12:02:19 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id i1so3669381pla.9 for ; Thu, 27 Jan 2022 12:02:19 -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=cGCYteteinr61zPnRrp4oGl0a47ZYXq3HmBJU43ZKkM=; b=k1sf94SonpGpLzpc1eZgA1C/aa+5bazFQmE3BqTBpHJIhPTVql2l5ddtWUYF0w2amf xglsb43JXD9he1Z6Lxg3FS8Mv9yHCSn7eNZo/7dJohdzh70qL8bvwWxSUMBvwRaJQvrW T/LIMTGmPZC8er6bC0A63ZUFrWWtFwytLjG8Q= 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=cGCYteteinr61zPnRrp4oGl0a47ZYXq3HmBJU43ZKkM=; b=0f1GoxTGNJWgUDFhNFjGYfKsh0Iy8dWYHnuBQ71B/7tU/HR+nSmdbxQlTOd7BYSQeC RziQInF05HwELpqZmxDLSZ5+c+GgH3Adgd8RPb6KegutuQF2cymWnRoqC4sfunHK9Xoh eIlBZMpBhoX1Rn3Ss0U5SFIKJ+qLMJPNJTPLZNEsXbU22ESyVWBUC1p6lRrTT6Ft5bu8 5R4l7lSWBXhfTiBPnSRW0aJ4gX6mu72iJdNPR3jyIHah3w/XmiEual39GN7JIJuYtWKU eWbzupR9QE47d/PXwh6nEVi5qrj5jsvztbK/7G3Wmbu9ShxuF+aJFhRTNMjjoW0R8owG 3jsQ== X-Gm-Message-State: AOAM53052b8jO+hd/kZmkKTqbE32jty5eqvm683K2Vrcpvgj1JPyoD1K 1po00aV8FOYCw+zkOlpdxM/Gvg== X-Received: by 2002:a17:903:2352:: with SMTP id c18mr5295494plh.104.1643313739361; Thu, 27 Jan 2022 12:02:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:19 -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, Tomi Valkeinen , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 19/35] drm/omap: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:25 -0800 Message-Id: <20220127200141.1295328-20-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: Tomi Valkeinen Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/omapdrm/dss/dss.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 69b3e15b9356..96a290a7bd68 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1304,8 +1304,9 @@ static const struct soc_device_attribute dss_soc_devices[] = { { /* sentinel */ } }; -static int dss_bind(struct device *dev) +static int dss_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct dss_device *dss = dev_get_drvdata(dev); struct platform_device *drm_pdev; struct dss_pdata pdata; @@ -1330,8 +1331,9 @@ static int dss_bind(struct device *dev) return 0; } -static void dss_unbind(struct device *dev) +static void dss_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct dss_device *dss = dev_get_drvdata(dev); platform_device_unregister(dss->drm_pdev); @@ -1339,9 +1341,13 @@ static void dss_unbind(struct device *dev) component_unbind_all(dev, NULL); } -static const struct component_master_ops dss_component_ops = { - .bind = dss_bind, - .unbind = dss_unbind, +static struct aggregate_driver dss_aggregate_driver = { + .probe = dss_bind, + .remove = dss_unbind, + .driver = { + .name = "dss_drm", + .owner = THIS_MODULE, + }, }; static int dss_component_compare(struct device *dev, void *data) @@ -1502,7 +1508,7 @@ static int dss_probe(struct platform_device *pdev) cmatch.match = &match; device_for_each_child(&pdev->dev, &cmatch, dss_add_child_component); - r = component_master_add_with_match(&pdev->dev, &dss_component_ops, match); + r = component_aggregate_register(&pdev->dev, &dss_aggregate_driver, match); if (r) goto err_of_depopulate; @@ -1541,7 +1547,7 @@ static int dss_remove(struct platform_device *pdev) of_platform_depopulate(&pdev->dev); - component_master_del(&pdev->dev, &dss_component_ops); + component_aggregate_unregister(&pdev->dev, &dss_aggregate_driver); dss_debugfs_remove_file(dss->debugfs.clk); dss_debugfs_remove_file(dss->debugfs.dss); -- https://chromeos.dev