Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp757874pxb; Fri, 28 Jan 2022 09:19:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkHbe13CtNrp5Kdim+PzaII93eHa+IiWpjHUCoPf1kddp3UXyoFeD/0FEJXkfD0kQgoYw9 X-Received: by 2002:a17:902:f54b:: with SMTP id h11mr10044833plf.58.1643390347423; Fri, 28 Jan 2022 09:19:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390347; cv=none; d=google.com; s=arc-20160816; b=Rm+wjjiCJMylZpBfuZezyR/QzEuO7kQ1gudJwdqepm2bzdDFLlKQxJ4u/rrEOxlydm EHi/7sGFJwkt4k13Ylq2dGoW7LkLXyfNlNnFvVotKkW4Mwuv7Z+1/p08cqMVbEM7QdeX RbxPV1bKa8kANt9RUiI3gRjyyyraa116YuzG5v3IqtyGQ2ck53Jo+wlJ5MpDjNVUxtKY TS8GeQrReBah2E0ElHlwbrQyCQlu7K9tcDWsMAjcEvUMUGNul6vBb5cz1mi1s5AFPSF9 fogHl8BRuZz1Z10Tj8KUdR6htZISx2OIBAFewvW33M0iNYz1iCvBc8krIaVqTQ6Rv9Rs E+ew== 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=WZZOtrHonizJg96tLMp/t5Fsa0Q7P0xuTO1TufH5G0g=; b=ZFOyeW6VLFdjr/+MQ0Ey88pxgjkpg3IgNitsm96y7NOvpVVuRyvqpsOJ3wUx1pJXQC WIzytv6mRqvECZnMSWomuhuYegBYH0jGaa8snfUm6TVY/99kfRmV3bNjUc48Y3VwVX37 JFNfxowAzcNB3yRSlimoqK2c/PD8RKE/NaT61+oCqbmbE4YRYol9mwfcJCMcETQ+njIA 6SwOeqhqJ8ibLH9Ed7SdVUDZsNiFVJ3RQVloCxDJGhX/NOdeHImnJGEcM93vdY5HX0Lc jSYMkgqNE8b5tbccaOI6YQ8XhZNKiZFdy0Kh6emIS1iqNyT7BuoqtD4n7GrPx8Eeme3l Mw/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JtASTOgj; 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 h3si6439605plf.203.2022.01.28.09.18.55; Fri, 28 Jan 2022 09:19:07 -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=JtASTOgj; 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 S1343801AbiA0UDD (ORCPT + 99 others); Thu, 27 Jan 2022 15:03:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343831AbiA0UCd (ORCPT ); Thu, 27 Jan 2022 15:02:33 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF832C06176A for ; Thu, 27 Jan 2022 12:02:23 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id q63so4155903pja.1 for ; Thu, 27 Jan 2022 12:02:23 -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=WZZOtrHonizJg96tLMp/t5Fsa0Q7P0xuTO1TufH5G0g=; b=JtASTOgjliVzgUuDAEkW0Ir5wrdjaMJtLwikgtGfArBmRuX33OZG0aepVuJRx2P4EY K5Jj7OesE+FqfW5gq9Ay8XCHtB7gY/xTVO9TMH8Moi/hdtqH5YekBCbOK8iwI9v0qKx2 u1JKO+JV8tJOVYIHoSfVA+SwgZ2Vh34t89+2Y= 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=WZZOtrHonizJg96tLMp/t5Fsa0Q7P0xuTO1TufH5G0g=; b=1rkKVGSBx+KmrPdcvywZVlcMExkGSpetnFoL+Yo10U0HP1m5MW4WOmnQYbZZtJ/1VX r7SiqT4F9BMOvqB96h3GSBPn1vqHtka6dP+6kr9VM/c15Edh//doFvqYtHQuIhVpMc1/ UJ8hp5iFQy51x0f4Q5oQ+RLTA7j0AipzmxQYQisy0KrAghHmBfx+icAt7j9VMu7swhgg 7Qwcm9IRKrdQKlPAFE6WlZ0SFxVHXc6nU5NVuSwxqD+WvCRXKM2tdSxkxlteVQnK6Pr2 b54O0mspmAFw/a/ySIcVhCudU2PuEx1LwFB3VoRAKfk1e2XsAJQXtUhCxcxbQT5UBj3t b4BA== X-Gm-Message-State: AOAM532l56ZGC+UYHY9vnGcx+ZXy0nYwlfY07kjrIxGPYhsxNJQiQw4r FWCZPr7ZP46w0PnVoVDIf952JQ== X-Received: by 2002:a17:90b:38d1:: with SMTP id nn17mr5880056pjb.58.1643313743266; Thu, 27 Jan 2022 12:02:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:22 -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, Maxime Ripard , Chen-Yu Tsai , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 22/35] drm/sun4i: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:28 -0800 Message-Id: <20220127200141.1295328-23-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: Maxime Ripard Cc: Chen-Yu Tsai Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/sun4i/sun4i_drv.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index b630614b3d72..9f20c3f0f93e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -56,8 +56,9 @@ static const struct drm_driver sun4i_drv_driver = { DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(drm_sun4i_gem_dumb_create), }; -static int sun4i_drv_bind(struct device *dev) +static int sun4i_drv_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm; struct sun4i_drv *drv; int ret; @@ -125,8 +126,9 @@ static int sun4i_drv_bind(struct device *dev) return ret; } -static void sun4i_drv_unbind(struct device *dev) +static void sun4i_drv_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm = dev_get_drvdata(dev); drm_dev_unregister(drm); @@ -140,9 +142,13 @@ static void sun4i_drv_unbind(struct device *dev) drm_dev_put(drm); } -static const struct component_master_ops sun4i_drv_master_ops = { - .bind = sun4i_drv_bind, - .unbind = sun4i_drv_unbind, +static struct aggregate_driver sun4i_aggregate_driver = { + .probe = sun4i_drv_bind, + .remove = sun4i_drv_unbind, + .driver = { + .name = "sun4i_drm", + .owner = THIS_MODULE, + }, }; static bool sun4i_drv_node_is_connector(struct device_node *node) @@ -398,16 +404,14 @@ static int sun4i_drv_probe(struct platform_device *pdev) } if (count) - return component_master_add_with_match(&pdev->dev, - &sun4i_drv_master_ops, - match); - else - return 0; + return component_aggregate_register(&pdev->dev, &sun4i_aggregate_driver, match); + + return 0; } static int sun4i_drv_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &sun4i_drv_master_ops); + component_aggregate_unregister(&pdev->dev, &sun4i_aggregate_driver); return 0; } -- https://chromeos.dev