Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp757753pxb; Fri, 28 Jan 2022 09:18:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCmpgKvoQ/tLxVUoknFUHbG9ZXPpqyVjz0aOSu02HD5Wb+qpo7oX6S0mOAxASsmnEl7gld X-Received: by 2002:aa7:9634:: with SMTP id r20mr8964539pfg.57.1643390338472; Fri, 28 Jan 2022 09:18:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390338; cv=none; d=google.com; s=arc-20160816; b=lI1juQT14OQMNW8dMac6RlX1l2hYzKaYfd+uFkL08YZpSZm8QKMZEHLAa0UsW893dy PAgPlRjdcfldLdeTwq47X6kyBjpKsv6WB+G267kEinEtyinKShnq88pjNvApNkwrOiMa I0YRP7amkBfN6hYEKye9pZGoXV762Frxk3Jb9T8sZYsw/CCHBNRfzSoqC204m/JQQjT3 PzkVAo6TTeRdfjVAJPAv6x8FTI5zKXcaKx5pYbUor3ghQZNsFuXjviEX8rIRulWNYnO2 7h0vr84XQf6oWGnrb9XDk7nXGUOoFry6WAcTBiPh/ezULigd8yYVJlhQTo8LcLVpPh76 hlIw== 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=p0aVwrwMtPKI+Zw3p14aaTjDl64C47sBEcl9anDi+5w=; b=w550yKL71g6/VqaW51+Hv5ZkXMQMe6S6waWwGs9w0BILN7z+wuJtID0TunJUuA/Djm bVyJ/MZVZBAWKuIwxzEbKPuqjQE1CviQwm8hwAeMrQgfC1i/LycOuH9c+ntxlE8hq87e g9xlQQqFALhi2IRzZ+346cSjkcveJdqz+PzqF6D64iCQ8FeM0i7OQxINZ/y99OWjWMMY x7hehPpeJ9FHXhVq1XdNNFFeEg+TekZ1tPj+leyN4Dej7PgiXFsnHncuhe9vIuYkXerk omf0WOm/zDyGqlwPoaGdpIJjZ/JrBwDkdqKpSDENU4CPZumFbce3DW84QD9Vop3PLhWb ftcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kwn63WCL; 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 j6si6403523plx.362.2022.01.28.09.18.44; Fri, 28 Jan 2022 09:18:58 -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=kwn63WCL; 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 S1343813AbiA0UCb (ORCPT + 99 others); Thu, 27 Jan 2022 15:02:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343689AbiA0UCM (ORCPT ); Thu, 27 Jan 2022 15:02:12 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 273E3C061747 for ; Thu, 27 Jan 2022 12:02:12 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id u130so3793309pfc.2 for ; Thu, 27 Jan 2022 12:02:12 -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=p0aVwrwMtPKI+Zw3p14aaTjDl64C47sBEcl9anDi+5w=; b=kwn63WCLro2pEoW3NUZStHAHthYrQFBO+1kqeg7vZ8cjmQFS4RPcurvo1UPCUI+Zu8 DCf3dOakK6x7VObPCC2Q4M9xUJzgL5Td/24BIsWeDVcKmXGpiAVsawi7ymo0ynrlFQ+W ZYTQlHIHGczG/PxwdFJuVlHEKV6iuElGTDXfU= 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=p0aVwrwMtPKI+Zw3p14aaTjDl64C47sBEcl9anDi+5w=; b=gVzGd1+K10HSJ3YucXpQ1W8bit7n29rsvWWRm0BV916Ims8He2miL0wpxIBNHepyFI IiHhKMGvavTmKR4ULYbClYezvR9cZ9/lycgS+Gcscr5XeKdLLUsK7uacLuwV7wnlMFax 4eDXc+D4Or6svHI4kp8nCxur6K8pRcGQnZPh/u1SlIPJTyTMbfTl2xBBoTPfPeeU5caX hIxDWkSH2zo+OYJGkujBNWJuD4wc04IFVQajCnhrd5oWspc/ZBXQHOr4rJMZwakvJ7CM htVUXsPvadSWcAnhBth0LADaJWk9bQZNs2U23LNvNqk+LI6vD363md1b8ZfZXxVaAIqS rx1A== X-Gm-Message-State: AOAM533pitgP7UVeVD8Py9So1tzT+EQl9YqUN6Lk9gnmXA9jgJkoBiao RAki46WAtXjQXME0uTrxUnxToQ== X-Received: by 2002:a65:6743:: with SMTP id c3mr3974983pgu.306.1643313731691; Thu, 27 Jan 2022 12:02:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:11 -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, Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 13/35] drm/exynos: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:19 -0800 Message-Id: <20220127200141.1295328-14-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: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 9743b6b17447..f9a3e7041254 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -244,8 +244,9 @@ static struct component_match *exynos_drm_match_add(struct device *dev) return match ?: ERR_PTR(-ENODEV); } -static int exynos_drm_bind(struct device *dev) +static int exynos_drm_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct exynos_drm_private *private; struct drm_encoder *encoder; struct drm_device *drm; @@ -321,8 +322,9 @@ static int exynos_drm_bind(struct device *dev) return ret; } -static void exynos_drm_unbind(struct device *dev) +static void exynos_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); @@ -341,9 +343,13 @@ static void exynos_drm_unbind(struct device *dev) drm_dev_put(drm); } -static const struct component_master_ops exynos_drm_ops = { - .bind = exynos_drm_bind, - .unbind = exynos_drm_unbind, +static struct aggregate_driver exynos_drm_aggregate_driver = { + .probe = exynos_drm_bind, + .remove = exynos_drm_unbind, + .driver = { + .name = "exynos_drm", + .owner = THIS_MODULE, + }, }; static int exynos_drm_platform_probe(struct platform_device *pdev) @@ -356,13 +362,12 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) if (IS_ERR(match)) return PTR_ERR(match); - return component_master_add_with_match(&pdev->dev, &exynos_drm_ops, - match); + return component_aggregate_register(&pdev->dev, &exynos_drm_aggregate_driver, match); } static int exynos_drm_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &exynos_drm_ops); + component_aggregate_unregister(&pdev->dev, &exynos_drm_aggregate_driver); return 0; } -- https://chromeos.dev