Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp758225pxb; Fri, 28 Jan 2022 09:19:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOw4Om2R5TX3FgP+oszwnAgZbf0xTEMTG3dzD5mywWuDU63k2jzpkdtiDyJHegKwLBfmqR X-Received: by 2002:a17:90b:3b88:: with SMTP id pc8mr13366745pjb.217.1643390371392; Fri, 28 Jan 2022 09:19:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390371; cv=none; d=google.com; s=arc-20160816; b=YUvHBcI3fgjjnbzXVxG7SZZlRVUSnyG5Qjkpuok1WGVemVhuVEVWyvba3GLcmvZI2B /cjfkrDp3DZN5E5CVKnxKnXXuzL0AFk/NN5uDO2o6R8Fu92EqjQxftOIj4xrzWy4O0KP MoCeceoPvu1W9WibpUKZF0e4sXIEhxW3WrecKNOg1hhQTghvH5EHSrXQpgkDwNxRWbMD vKk9P6GOphQHoa6KMUFPkvptHe5eOo0ypzdwJB0IzXjlsxe4C7aGGAYu6ysVjuzO/KKT Tyw6g6KEbXAbZzZdaOZmZaO+7LuuDqLjiNpNdzZts9Uv9Z1oV30v7QEub/ZQ3mFCoqJU Tsyg== 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=w0WjtZCiA2Izv5LYYNS4nUlyXyc0y53v4Rvk7s0pbe0=; b=zTNZ8GDKYAcuxIHooM/AMkjRTTfMk/bmOSFEFY9wcrPUxn4qukqKzJSU9wo7XNfQHN ocAvpI+L16TPsmB+U+8Vp9VZW5ZRGwr4CKddD2OxHqwSBzn39NDs1FnxhJkFVlSIpbSN L46X8JgCvfSFcDtyw/0+FITaOeQYtQYDE5wCzSpalbn49BxHXB6zln34IExXq2VDwL49 9dYyncjCQHXqac8X9JEzZkdnU4gtrimeHCyK0BPqI0Dzgt0LDTdBXrea6GXmO8nzR461 1zxMWqAuqOGW28+zXs/tqLro3qQi9lR/jXyAQEUDpAM14iWQP6i3yQB9aYoqdU4d3ZvW y5mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=N1+WfbFd; 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 8si6035367pfm.146.2022.01.28.09.19.19; Fri, 28 Jan 2022 09:19:31 -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=N1+WfbFd; 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 S240582AbiA0UDm (ORCPT + 99 others); Thu, 27 Jan 2022 15:03:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343731AbiA0UCe (ORCPT ); Thu, 27 Jan 2022 15:02:34 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 831E6C061770 for ; Thu, 27 Jan 2022 12:02:26 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id z10-20020a17090acb0a00b001b520826011so8654505pjt.5 for ; Thu, 27 Jan 2022 12:02:26 -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=w0WjtZCiA2Izv5LYYNS4nUlyXyc0y53v4Rvk7s0pbe0=; b=N1+WfbFdWfFWm8JZDkISDKtq8PppgDmD79xW8tNVglUX7OWvRmJS2Wh8sMT5FI3vAy tsKqmQ0M8qIAp054xQUwpCGIaNg9cIbGxzzwfhBal7cAk2vj8DKOZGPx05QoCOH+i7Eq moKrr1lTYTcMvhTnoQwPjc8fbcGK4uzBIFz24= 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=w0WjtZCiA2Izv5LYYNS4nUlyXyc0y53v4Rvk7s0pbe0=; b=XnZVgJ0ANsOuyix8R4g0xyehIQxbgxp/f04ULejOoGhdG1oG4WBFrX0XQ8F/klMQKj ACOxPX2AkPtmqIjGNJNeuVG6ZT5/TScyjh8dHhwAYDDMr5MCcVXmfgC8disbase/qw6P 3fUxySrh5bK8UvV8VCO8qU/OICXAf9hlP0LH64UzRmTIUFsPaRjL2hCmWfUNnbFn3zP+ oeMgVFUGeBCQjYqQiJKg+Y1tRl/ieDebY9fdEs5eNH7qwIt1guopW+SzQc2E0d5p5bb1 0+Pu+HbKLPo433Q2ew0cfR5hWUWo7WTkSqEh29wDsY9y83cUAZCKE/X0NsXSl704Ih0H Rp2Q== X-Gm-Message-State: AOAM531Gih1Oh/PyXsfFV7wQp7fekgmFTg631IWd8uN1ATlDmZvOFNB5 camA6mcG1SHHgv0b6Hs+kTQZqQ== X-Received: by 2002:a17:90b:4d0e:: with SMTP id mw14mr3383117pjb.133.1643313746070; Thu, 27 Jan 2022 12:02:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:25 -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, Emma Anholt , Maxime Ripard , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 24/35] drm/vc4: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:30 -0800 Message-Id: <20220127200141.1295328-25-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: Emma Anholt Cc: Maxime Ripard Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/gpu/drm/vc4/vc4_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 16abc3a3d601..297ecddea5fb 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -212,8 +212,9 @@ static void vc4_match_add_drivers(struct device *dev, } } -static int vc4_drm_bind(struct device *dev) +static int vc4_drm_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm; struct vc4_dev *vc4; @@ -284,8 +285,9 @@ static int vc4_drm_bind(struct device *dev) return ret; } -static void vc4_drm_unbind(struct device *dev) +static void vc4_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); @@ -293,9 +295,13 @@ static void vc4_drm_unbind(struct device *dev) drm_atomic_helper_shutdown(drm); } -static const struct component_master_ops vc4_drm_ops = { - .bind = vc4_drm_bind, - .unbind = vc4_drm_unbind, +static struct aggregate_driver vc4_aggregate_driver = { + .probe = vc4_drm_bind, + .remove = vc4_drm_unbind, + .driver = { + .name = "vc4_drm", + .owner = THIS_MODULE, + }, }; /* @@ -326,12 +332,12 @@ static int vc4_platform_drm_probe(struct platform_device *pdev) vc4_match_add_drivers(dev, &match, component_drivers, ARRAY_SIZE(component_drivers)); - return component_master_add_with_match(dev, &vc4_drm_ops, match); + return component_aggregate_register(dev, &vc4_aggregate_driver, match); } static int vc4_platform_drm_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &vc4_drm_ops); + component_aggregate_unregister(&pdev->dev, &vc4_aggregate_driver); return 0; } -- https://chromeos.dev