Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp757570pxb; Fri, 28 Jan 2022 09:18:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGcJq/niyiOqxpHhWwFwlw1LLblGTD3v08UTlV1RteLKLSyev9NHyTAUhpQxeDYa72j2cd X-Received: by 2002:a63:be45:: with SMTP id g5mr5530713pgo.386.1643390328027; Fri, 28 Jan 2022 09:18:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390328; cv=none; d=google.com; s=arc-20160816; b=CPwXoBdSjtkiA8mbJ9wTyGmWmmUxxkBgzp4pfP/M1amdPMKEBEBthnwNlu0IYZl5e+ CPRqRlOIkHRxl5mqG1vgy2CzoAskFQMX5fafhEn2xZgL7VvF8Mj9FMdFHWQtiVz3ffE9 eKkP9/cMOsBo6pTpW+hlyKfe2Eg08o0/AeZeLBoLSI5ZQ9DE33ac8jYiRMtLVwZGjPou 95x7dPhfAlKAdwqS9htEsYOHsD6l6poY4TkpJcWnAHZMh4n+CPnBe8ALlfqZNFF6/4W/ 8QGJKqOd2Mo8rGTjSKKxbtE2FFpnWyPyL+CcRixHlNvMtTLPYDaB0WisY2PBWMrT1B4Q YvKw== 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=eLJCnI04jLKqZN/UJPBzqXUPWPAN0XVbPbOc1ZGY6qU=; b=u7JPTmNzMUFrSapHaRC/UOK35nF/83XJASivb4SXWS8RM3QfK781B9lNyQ5FMBu2SY NAu6lZlklPPRrY+KIW0jMRjXPjxSQj7zH9KsL/sgjHbBgqVtmK2hy5ri9yg4ASci6q3X r2oCfm28xBpsoyL0voQhbzAoDcx4cnSLCxl8lPY7U1y7zkaunRV3mBlIg6FnYhl8WZtp OvDD2SwyTE2ycmrOqbyI6zbtIpLwHgDNIF9RUePuUuJG3TFWOMdb2KNc2H/G+zEA1Uj1 FhwjO3xnuDtKRs3amW1olFon9Dt8cbLpOAU3tuN+TtYG0OMJ/DDDYLT4XcZD7BaTFwh0 J+Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DEFDTqec; 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 s84si6169365pgs.644.2022.01.28.09.18.35; Fri, 28 Jan 2022 09:18:48 -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=DEFDTqec; 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 S1343707AbiA0UCO (ORCPT + 99 others); Thu, 27 Jan 2022 15:02:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343677AbiA0UCH (ORCPT ); Thu, 27 Jan 2022 15:02:07 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B498EC06175A for ; Thu, 27 Jan 2022 12:02:06 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so8655052pjj.4 for ; Thu, 27 Jan 2022 12:02:06 -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=eLJCnI04jLKqZN/UJPBzqXUPWPAN0XVbPbOc1ZGY6qU=; b=DEFDTqec9EAgV78bsUSeeOgUOjpE2PZ60LrfxDPd0F5Ja1M7OoSVPixyF9mPpGTYtf jDiBonceMAplYpEW7lO1v2w1ka+CKtfuNKfnSqfu7r99b6ZRRYkUYkRbmv4w107O6IXe dtjVxyY/6RMgJRiJxYVUfSw9pUyxA8ZXMi1S4= 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=eLJCnI04jLKqZN/UJPBzqXUPWPAN0XVbPbOc1ZGY6qU=; b=K4AZEMWvUl3G7e12XIf1VyFGZmhKJRQw9MtxfsGm5mHFir/+OUxcsGf7kROCi1S6wi NBkwM0Uy6uTmw5XS+NaYHT6rX/zxLxYsoBH1OuS/nVRHDT1/vmBQ/I1oXqzMGn6iYxkv uKZwAvrIEanDnSF8dhU67IqcZ/ehk/i8SVtmA5SuAiaS4JMvgNnIYA923dPaGXgs5OWW sfyur+KC4qb+FUHVKPQBEt3gUbVYq7QjiBUH/s0/o3XXoOecTEOJ2LUSEz0Me+LeFHUk 6xllk1Zm5GVlMLVGt6X0U3Bw6/7P0NcN5Nq+NFKIxsB46qcIf9YpXsrKNCxoZttDXenQ Inmg== X-Gm-Message-State: AOAM531b4gzQUTbiHuwMfo3bRQkdnWRS/dmTkfuf97lK8WYO/6xhsMuV r5z9905Tzm6qI98WIGsHN7hI0Q== X-Received: by 2002:a17:902:ab43:: with SMTP id ij3mr1259523plb.102.1643313726269; Thu, 27 Jan 2022 12:02:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:05 -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, Laurent Pinchart , Liviu Dudau , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 09/35] drm/malidp: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:15 -0800 Message-Id: <20220127200141.1295328-10-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: This can be updated to move the drm helper logic into the aggregate driver shutdown op. Cc: Laurent Pinchart Cc: Liviu Dudau Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/arm/malidp_drv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 78d15b04b105..7b946b962b22 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -702,8 +702,9 @@ static int malidp_runtime_pm_resume(struct device *dev) return 0; } -static int malidp_bind(struct device *dev) +static int malidp_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct resource *res; struct drm_device *drm; struct malidp_drm *malidp; @@ -894,8 +895,9 @@ static int malidp_bind(struct device *dev) return ret; } -static void malidp_unbind(struct device *dev) +static void malidp_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct drm_device *drm = dev_get_drvdata(dev); struct malidp_drm *malidp = drm->dev_private; struct malidp_hw_device *hwdev = malidp->dev; @@ -921,9 +923,13 @@ static void malidp_unbind(struct device *dev) of_reserved_mem_device_release(dev); } -static const struct component_master_ops malidp_master_ops = { - .bind = malidp_bind, - .unbind = malidp_unbind, +static struct aggregate_driver malidp_aggregate_driver = { + .probe = malidp_bind, + .remove = malidp_unbind, + .driver = { + .name = "malidp_drm", + .owner = THIS_MODULE, + }, }; static int malidp_compare_dev(struct device *dev, void *data) @@ -949,13 +955,12 @@ static int malidp_platform_probe(struct platform_device *pdev) drm_of_component_match_add(&pdev->dev, &match, malidp_compare_dev, port); of_node_put(port); - return component_master_add_with_match(&pdev->dev, &malidp_master_ops, - match); + return component_aggregate_register(&pdev->dev, &malidp_aggregate_driver, match); } static int malidp_platform_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &malidp_master_ops); + component_aggregate_unregister(&pdev->dev, &malidp_aggregate_driver); return 0; } -- https://chromeos.dev