Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp757787pxb; Fri, 28 Jan 2022 09:19:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzp+tM4TYs4rbMBkSywV3fEpW1Md+Erg7z/daU9QHYkpegnQ9t81PD8MKAkvhkh52PH+v7q X-Received: by 2002:a05:6a00:2490:: with SMTP id c16mr8804855pfv.67.1643390341093; Fri, 28 Jan 2022 09:19:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390341; cv=none; d=google.com; s=arc-20160816; b=XIYESc8pYUP5I2wsJQgo5gODGyioDpNldkiG5M2FtjhEjtTGWHZ6S4S2cls64bEUvW EH6Cre1pNSM2NXkz0IZOZRQhbA5D5ZdB9gkZYxkqBwx7nuRZ0RW2RMrv+ilbYfDO0iSU ZvS9YdUShSIt7RWQ2hzITlA6/TbIaiR0PYuC09AkP7LliwccTb1WTPUUiXlApa1fXo9D xh8+1ysFZCVoRflKKdlqEx/EwkZYdbq4YN8A84dyfIPm+9D4m5wK0ZgElTZOwRPK1PlL TWNVzA1CsXWxuvhPFnA1zJx19xgpOs5ksd3Ctv2oApPjCurAGIRpY7lOphTmoLY5YPZ0 yVvw== 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=14tXiFXD9g15QAgF752Bjks0tTvAFdkYAmJeNpUGDFE=; b=cb+xZ0Okl0QkiuKLFe/qzwU/QQmkSre3oYzlqOGpRS06wWtOlH8htS/26XfaOnSHYh CL0WAT8hC1OXE7a6jFfzCz8S53nwzxyBOKLi/00irQ1e6V32L0BrjVQA3G1G3zrpC9og KU35Zv7Ql+REZNlt2E2HM4syK2GYLBsfgZViFPEtlmdC312S+XW8U8QShPQkBEZmXg6P Y9/D1Z4rv6xYaCKzYNmn0djHfBMsly6omLreAPSQXoBSsPJvKTgJhHhTNovQYGyWP5U/ dBmWcjDCn5iYUjGxGXJ9//g3u3w9pjas+Dh+cKo3QzgzWg1w4tfM3EsCyk5Ki25v2mZg X4pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UJ3pWRNz; 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 x184si5900555pgb.676.2022.01.28.09.18.48; Fri, 28 Jan 2022 09:19:01 -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=UJ3pWRNz; 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 S1343859AbiA0UCf (ORCPT + 99 others); Thu, 27 Jan 2022 15:02:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343715AbiA0UCP (ORCPT ); Thu, 27 Jan 2022 15:02:15 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDFEAC061747 for ; Thu, 27 Jan 2022 12:02:14 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so4174671pjp.0 for ; Thu, 27 Jan 2022 12:02:14 -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=14tXiFXD9g15QAgF752Bjks0tTvAFdkYAmJeNpUGDFE=; b=UJ3pWRNzqmBr5jjMWL3C1NCDOyzHTVGRBEEV5Qjr0RTHka8AG1QzIcMnCpxlWvVMRF l6qJLOapBxSEL5K/iiTXohEi3SbvC6S4Yl/qitYDN8qOWC1FARr7XcHB5d6bOo4QbiDy CO6UTVN3O9ByQaeACCXxYwSkKyp5A5fA4DqX8= 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=14tXiFXD9g15QAgF752Bjks0tTvAFdkYAmJeNpUGDFE=; b=6AonbnYaDbvsfemiT5d4QuphkiebXwN9pRf2fwV37e6oKzbLZbcGppxV9G+vlWcZFP bF7rexFl1HcQOc5Ip1uhreRrN9MO3pEQZX2vTrMZyq7Ncg8bysXmOeEhTwEDMR4HbxHk SGwysSlmNhijtatNtUj0aVymCwjZcrz6lpXtB+Z94UdMTjrjwsus1RkSgRoXoYpep5lI UmM/AD9Rca6p1Q5wFzE4OjFOLIDfEKixotywyX7sW+bvbw7kziKGRRQUvVZyze+SmUTb HAjTk1J4SA7XpNjTz5/VrH8ZLd9hLh3bQd2I1Xo41jNPmdCEuxyy3C/Lnzav/lklsdLj YPZg== X-Gm-Message-State: AOAM530PXgmglRVc15GhZIVFChX3PeC17nFyBtCwdNy3iQwucDM0dWq8 kT2aXcuHimGW5sZLkBx+9SaARQ== X-Received: by 2002:a17:90b:3a90:: with SMTP id om16mr5800717pjb.123.1643313734317; Thu, 27 Jan 2022 12:02:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:13 -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, Paul Cercueil , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 15/35] drm/ingenic: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:21 -0800 Message-Id: <20220127200141.1295328-16-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. TODO: Move the helpers to PM in aggregate driver hooks. Acked-by: Paul Cercueil Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 25 +++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index b4943a56be09..c094f9917874 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1317,8 +1317,10 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) return ret; } -static int ingenic_drm_bind_with_components(struct device *dev) +static int ingenic_drm_bind_with_components(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); + return ingenic_drm_bind(dev, true); } @@ -1341,9 +1343,20 @@ static void ingenic_drm_unbind(struct device *dev) drm_atomic_helper_shutdown(&priv->drm); } -static const struct component_master_ops ingenic_master_ops = { - .bind = ingenic_drm_bind_with_components, - .unbind = ingenic_drm_unbind, +static void ingenic_aggregate_remove(struct aggregate_device *adev) +{ + struct device *dev = aggregate_device_parent(adev); + + ingenic_drm_unbind(dev); +} + +static struct aggregate_driver ingenic_aggregate_driver = { + .probe = ingenic_drm_bind_with_components, + .remove = ingenic_aggregate_remove, + .driver = { + .name = "ingenic_drm", + .owner = THIS_MODULE, + }, }; static int ingenic_drm_probe(struct platform_device *pdev) @@ -1363,7 +1376,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) drm_of_component_match_add(dev, &match, compare_of, np); of_node_put(np); - return component_master_add_with_match(dev, &ingenic_master_ops, match); + return component_aggregate_register(dev, &ingenic_aggregate_driver, match); } static int ingenic_drm_remove(struct platform_device *pdev) @@ -1373,7 +1386,7 @@ static int ingenic_drm_remove(struct platform_device *pdev) if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) ingenic_drm_unbind(dev); else - component_master_del(dev, &ingenic_master_ops); + component_aggregate_unregister(dev, &ingenic_aggregate_driver); return 0; } -- https://chromeos.dev