From patchwork Fri Jul 10 23:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2A4713B4 for ; Fri, 10 Jul 2020 23:03:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9F4620786 for ; Fri, 10 Jul 2020 23:03:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="YqfD9if0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbgGJXCr (ORCPT ); Fri, 10 Jul 2020 19:02:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726769AbgGJXCq (ORCPT ); Fri, 10 Jul 2020 19:02:46 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64ED9C08C5DC for ; Fri, 10 Jul 2020 16:02:46 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id f2so2842315plr.8 for ; Fri, 10 Jul 2020 16:02:46 -0700 (PDT) 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=KDlhJEK8bEQDr4AEmZYceY0lLW1c8BenSCxp/VqeSg0=; b=YqfD9if0lPwu+n0J/F3oyLF5d7cL9WsuOonWuP7ZQ7PJ7PHL9OzPXYWf5BPO5qfemv SwrxE7PTMHZjhNQO4tH9fw+9KDQRmBRGfNSVmqpTEvMVsy78vW07p1D36O+Is2YPUW6P wG6iJcV73pywBqYswv6ZmNfhjbzdG/8cq++88= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KDlhJEK8bEQDr4AEmZYceY0lLW1c8BenSCxp/VqeSg0=; b=q+bItDPm3dBG9wYmdug3xZUq8KlO2Xv9eNskzsXz7JeMUoqXkK4uFYacVhbC3ysk3G c5VpDZll7PxHoSdUMgvg8ApT1Vz2Sre2TndxY7ibd9TAQSsh9gvhRh3v+v0fcpdc8aFM CuI+BtzSNhFps0Bd5lrSpsPl3FfmwdyXBjJgIN+8JnvWCyYKEOXfcP5d4GaDTO14O/VC Z8kZFGTvtt569vUVz5v696poypypuDZdAfV00atIKNu1GcUbHQogoRVfR2plwSCg6CUJ BdkiR7x5W3UqNwSuEZoDrxUdbu93ZTWcy0bTWwu72hSmeeuilRrnZplluIBbqqky6wQF Y0XQ== X-Gm-Message-State: AOAM5301z52t+fYc8MLZR1wDnzy0Ly4pMvIYKZsNYwFP9lgXkR5+MTec Vx7LTfzh5bhFKvOMoPSSRuDhkFxLID4= X-Google-Smtp-Source: ABdhPJwSPO3qFeV3DepwLxB8csth6F4T+/Ne+JcPTYmGZnrrv09IRasdUI54wXZe6z/2aXeJ8r0VXw== X-Received: by 2002:a17:90a:f3ca:: with SMTP id ha10mr7762940pjb.46.1594422165962; Fri, 10 Jul 2020 16:02:45 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:45 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , Daniel Vetter , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 1/9] drm/msm: Use the devm variant of of_platform_populate() Date: Fri, 10 Jul 2020 16:02:16 -0700 Message-Id: <20200710160131.1.I3f7862adcb0806d56a8c7260857d887100b06b41@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Let's save ourselves some hassle and use the devm variant of of_platform_populate() do we don't need to worry about manually depopulating. Signed-off-by: Douglas Anderson --- drivers/gpu/drm/msm/msm_drv.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index f6ce40bf3699..78b09fde9e29 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1208,7 +1208,7 @@ static int add_display_components(struct device *dev, if (of_device_is_compatible(dev->of_node, "qcom,mdss") || of_device_is_compatible(dev->of_node, "qcom,sdm845-mdss") || of_device_is_compatible(dev->of_node, "qcom,sc7180-mdss")) { - ret = of_platform_populate(dev->of_node, NULL, NULL, dev); + ret = devm_of_platform_populate(dev); if (ret) { DRM_DEV_ERROR(dev, "failed to populate children devices\n"); return ret; @@ -1217,7 +1217,6 @@ static int add_display_components(struct device *dev, mdp_dev = device_find_child(dev, NULL, compare_name_mdp); if (!mdp_dev) { DRM_DEV_ERROR(dev, "failed to find MDSS MDP node\n"); - of_platform_depopulate(dev); return -ENODEV; } @@ -1232,8 +1231,6 @@ static int add_display_components(struct device *dev, } ret = add_components_mdp(mdp_dev, matchptr); - if (ret) - of_platform_depopulate(dev); return ret; } @@ -1300,30 +1297,21 @@ static int msm_pdev_probe(struct platform_device *pdev) ret = add_gpu_components(&pdev->dev, &match); if (ret) - goto fail; + return ret; /* on all devices that I am aware of, iommu's which can map * any address the cpu can see are used: */ ret = dma_set_mask_and_coherent(&pdev->dev, ~0); if (ret) - goto fail; - - ret = component_master_add_with_match(&pdev->dev, &msm_drm_ops, match); - if (ret) - goto fail; - - return 0; + return ret; -fail: - of_platform_depopulate(&pdev->dev); - return ret; + return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match); } static int msm_pdev_remove(struct platform_device *pdev) { component_master_del(&pdev->dev, &msm_drm_ops); - of_platform_depopulate(&pdev->dev); return 0; } From patchwork Fri Jul 10 23:02:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657493 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AFFAB13B4 for ; Fri, 10 Jul 2020 23:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 94632207D0 for ; Fri, 10 Jul 2020 23:02:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="k8zU2rjL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726914AbgGJXCs (ORCPT ); Fri, 10 Jul 2020 19:02:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbgGJXCr (ORCPT ); Fri, 10 Jul 2020 19:02:47 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA529C08C5DC for ; Fri, 10 Jul 2020 16:02:47 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id x9so2853518plr.2 for ; Fri, 10 Jul 2020 16:02:47 -0700 (PDT) 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=SOEifiIh+gw1ksCpw3+MdPsiCbOdQ0cDfgdVRKb9Csc=; b=k8zU2rjLwwu9xxH6CtqzfzziVe1vGy1bbnfaYS4aV6d8OBtTZkbwlSOJJvvmPXJbSR e+lH31NsyffijpPqmezQuKlLqrpVO65l/rRqLmPGfkCVwXEwRCH5bYRYw15DCh6yEcR+ 41eQMVmiDyHYBBVuEs5cYvgWCaYuLUL9AnpjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SOEifiIh+gw1ksCpw3+MdPsiCbOdQ0cDfgdVRKb9Csc=; b=eZT5LsleV1t4PRmyHkrj6hec0VW2XRBG8ngHoR5kyTWhogcWkHmD45a0LpgIO5tbJr ByvWuIFbuxZ7k8Q0+Af8UnzQPhoRTr6G/S7kkzqomIGp7sSriC0ra10fZkACOwTFL2v0 Ewz7Z63Tks5PEpNzTgCfFBD+nC5mMxXo/iikCToh95AYFhq7FkWOsSmK4x990SQYNPts uXyrzPbBZucBywK14E5XVRfuoiV6xoxuWwe/G2ku95MLYJ6u2swFikc5wBME0wdu0fH2 Le5YsFBV6cvD5QyZKks5kqy9+tJ7k4jXrRM9UG2CT38WnQacpVlxIwvC7c3iCP/06yI+ 9ung== X-Gm-Message-State: AOAM531RmaujX5zX/TJDTHQ/9Stuu7MBjiNtnVgHUiR2ltiY0oN0Ijle wyoXSQbeI2kpYzdaAinoby7Ulg== X-Google-Smtp-Source: ABdhPJzdSjyDJg2gb4e4NI73Cop7js70UClKGQIJKPQF33PAmLwF3oSqZOi78uGWEWIaJ81gbrnxfg== X-Received: by 2002:a17:90a:cc:: with SMTP id v12mr7439843pjd.96.1594422167234; Fri, 10 Jul 2020 16:02:47 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:46 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , Daniel Vetter , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 2/9] dt-bindings: msm/dpu: Add simple-bus to dpu bindings Date: Fri, 10 Jul 2020 16:02:17 -0700 Message-Id: <20200710160131.2.Id4b5c92d28b7350d047218774afaf69b683651e0@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org We have a whole bunch of child devices that we really just want treated as other devices to instantiate. Add the "simple-bus" property for this. Commit-notes This bindings file really needs to move over to yaml. Hopefully someone at Qualcomm who's working on display code can help with that. Right now on Linux we have a manual call to of_platform_populate() to populate our children. That's pretty non-ideal as described in another patch in this series and I'm trying to remove it. I'm not sure how much of a hack to consider "simple-bus". I've seen it used like this before, but if folks tell me that it's terrible then I guess we'll have to figure some other way out of our crazy -EPROBE_DEFER loop in Linux. END Signed-off-by: Douglas Anderson --- Documentation/devicetree/bindings/display/msm/dpu.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/dpu.txt b/Documentation/devicetree/bindings/display/msm/dpu.txt index 551ae26f60da..b88269524365 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu.txt +++ b/Documentation/devicetree/bindings/display/msm/dpu.txt @@ -8,7 +8,9 @@ The DPU display controller is found in SDM845 SoC. MDSS: Required properties: -- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss" +- compatible: One of: + - "qcom,sdm845-mdss", "simple-bus" + - "qcom,sc7180-mdss", "simple-bus" - reg: physical base address and length of contoller's registers. - reg-names: register region names. The following region is required: * "mdss" From patchwork Fri Jul 10 23:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657525 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7537E13B1 for ; Fri, 10 Jul 2020 23:03:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CC1220786 for ; Fri, 10 Jul 2020 23:03:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SfhM9LjM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726829AbgGJXDW (ORCPT ); Fri, 10 Jul 2020 19:03:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726927AbgGJXCt (ORCPT ); Fri, 10 Jul 2020 19:02:49 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC1EC08E6DC for ; Fri, 10 Jul 2020 16:02:48 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id k5so3230347pjg.3 for ; Fri, 10 Jul 2020 16:02:48 -0700 (PDT) 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=Kf4bs78mZD6VPb7hGbMzwU1SDkoaJXih+VvUUu+oT8M=; b=SfhM9LjMFbCFHtzRBA4SYqf4zywNRWj3h+ZgZB00uTROQfzpfdrl4ryysqaf4tBwmn FN5/X0Iaz/Jv0JelCgSiqQCksM1Mtpd61VVkSa5kJaEzio+e8kAzYsbBZWtOdJnGC0IZ LJKsybrd4RMtUZ3XEr2Cn+AYmRcozOtq4sOtg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kf4bs78mZD6VPb7hGbMzwU1SDkoaJXih+VvUUu+oT8M=; b=PxkCkZkOWt7NoCQtzppftEyeCvPVzktIX7MQagtBeWkWrCqgCQs1hKA6clBhlQ1bEH MNpm7n0t+4XicoFZVQ20tm+xz2vmVUdZZzN2lR/T0EGv1L4m6bIdO3a/Xyv0r2saDlCB gf+4gqoqbqtu35/Ifs+ZMecEugLpqd63A02PCNhksLmvvoZ4p5LRLL4EnZzjXkGKhZC3 LYOhlIfklbxKmoBEMQAaSa1+ajrUl7/miwUI7NHDRz1CLVLNQNO+Fdaddzqjyj6hxY37 DWhwadla61MjC+sW2EDb12CL96ZpaPmvA9FAElW4STnwjXpoezF3usAYfvWJsV1laNLH GHeA== X-Gm-Message-State: AOAM530BTKpzUn7mJW0zj3E6TehKvLKS46BFjLbXtLmhreugsRUTEKrM 1O3/anmrf9IYgBzcGy4/iraW/g== X-Google-Smtp-Source: ABdhPJzXgkBIOOjHFIe0B/r5cwGP2/G1OFIlhiURScaD7ul10GXJnds6PU6GdJAicb/gntGJ5m6eTA== X-Received: by 2002:a17:90a:e7cd:: with SMTP id kb13mr7950555pjb.138.1594422168452; Fri, 10 Jul 2020 16:02:48 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:47 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , Daniel Vetter , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 3/9] dt-bindings: msm/mdp5: Add simple-bus to dpu bindings Date: Fri, 10 Jul 2020 16:02:18 -0700 Message-Id: <20200710160131.3.I823f3420d7c25300a58819ff03560ca4d41e53f6@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is just like the patch ("dt-bindings: msm/disp: Add simple-bus to dpu bindings") but for the mdp5 bindings. Signed-off-by: Douglas Anderson --- Documentation/devicetree/bindings/display/msm/mdp5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/mdp5.txt b/Documentation/devicetree/bindings/display/msm/mdp5.txt index 43d11279c925..bb57b07b7546 100644 --- a/Documentation/devicetree/bindings/display/msm/mdp5.txt +++ b/Documentation/devicetree/bindings/display/msm/mdp5.txt @@ -9,7 +9,7 @@ controller found in SoCs like MSM8974, APQ8084, MSM8916, MSM8994 and MSM8996. MDSS: Required properties: - compatible: - * "qcom,mdss" - MDSS + * "qcom,mdss", "simple-bus" - MDSS - reg: Physical base address and length of the controller's registers. - reg-names: The names of register regions. The following regions are required: * "mdss_phys" From patchwork Fri Jul 10 23:02:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657521 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5DCE13B1 for ; Fri, 10 Jul 2020 23:03:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87BD720767 for ; Fri, 10 Jul 2020 23:03:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Et6Dk9C0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbgGJXDO (ORCPT ); Fri, 10 Jul 2020 19:03:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726961AbgGJXCu (ORCPT ); Fri, 10 Jul 2020 19:02:50 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D008C08C5DC for ; Fri, 10 Jul 2020 16:02:50 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id ls15so3227811pjb.1 for ; Fri, 10 Jul 2020 16:02:50 -0700 (PDT) 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=tVqx7g36rFA8fGH9HPQE1NOw2DZAuX6VKaMN/UQGYmk=; b=Et6Dk9C0ZAXRSSAVBOeYyozI3Jj+uhoeW1ZrbIn4h7Zhux2W8tHEXkW2/mrDbKQZqL Uvg6xpKFBy1wu6a4o5ZQrtYyfcgypwjH2LJNmsuaN5NHupqledwdyeX8dcn770r3gX2g hlziyVRNx3N8dW2y2fAPskxRWpjbeRquFS9fA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tVqx7g36rFA8fGH9HPQE1NOw2DZAuX6VKaMN/UQGYmk=; b=k9W6TbsgbHVGmGgrwoxP9XyhOjYLfNuo1skCLbYPdSKC/eVNZmtjQd1pdNFBkZr2M5 trU7NngW+i9X4S+KWZrckA9dEtT8D1jeY6uHDmUbo8c5e4js+MPKYlO2xlsUq6/5VV6A J2XqixYuGuGaS0q0etat+3P+DplJVXdTwRxKLzfF22XY6vwC7IUNVDHEkgerC3m3Fs2q zyJqRyJOA0hWGjEYkwMY0TTI/8s+OJqZh55reaGTyXpaLxBDA5Xd6IuuxB9xD1dSowQA kOPerjX5DBn0dIKi2E/sd8hubUZNUYy8SMl+n72uE8T68tFj4SmMV4NckftUM+xTL4b4 Yy5A== X-Gm-Message-State: AOAM531nM3aUx/pyGut2AHN0Eps7Vq/vTiov99oGqQVxgnnMYxjJX5ZA QbWreYUSwbY8rj5mF6virynzOw== X-Google-Smtp-Source: ABdhPJw4NYcILGIGbzu/Mo7t5i5bNT/aUinQfG5IFKgb6SVXfZdHoKdaoadkxhHDmq9STiHl74UbJg== X-Received: by 2002:a17:902:d215:: with SMTP id t21mr40582652ply.136.1594422169822; Fri, 10 Jul 2020 16:02:49 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:49 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , Daniel Vetter , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 4/9] drm/msm: Avoid manually populating our children if "simple-bus" is there Date: Fri, 10 Jul 2020 16:02:19 -0700 Message-Id: <20200710160131.4.I358ea82de218ea5f4406572ade23f5e121297555@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org If our compatible string has "simple-bus" at the end of it then the system will handle probing our children for us. Doing this has a few advantages: 1. If we defer we don't have to keep probing / removing our children which should speed up boot. The system just probes them once. 2. It fixes a problem where we could get into a big loop where we'd have: - msm_pdev_probe() is called. - msm_pdev_probe() registers drivers. Registering drivers kicks off processing of probe deferrals. - component_master_add_with_match() could return -EPROBE_DEFER. making msm_pdev_probe() return -EPROBE_DEFER. - When msm_pdev_probe() returned the processing of probe deferrals happens. - Loop back to the start. Signed-off-by: Douglas Anderson --- drivers/gpu/drm/msm/msm_drv.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 78b09fde9e29..f7c6ef147095 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1208,10 +1208,18 @@ static int add_display_components(struct device *dev, if (of_device_is_compatible(dev->of_node, "qcom,mdss") || of_device_is_compatible(dev->of_node, "qcom,sdm845-mdss") || of_device_is_compatible(dev->of_node, "qcom,sc7180-mdss")) { - ret = devm_of_platform_populate(dev); - if (ret) { - DRM_DEV_ERROR(dev, "failed to populate children devices\n"); - return ret; + /* + * Old device tree files didn't include "simple-bus" + * in their compatible string so we had to manually pouplate + * our children. When existing device trees are fixed this + * can be removed. + */ + if (!of_device_is_compatible(dev->of_node, "simple-bus")) { + ret = devm_of_platform_populate(dev); + if (ret) { + DRM_DEV_ERROR(dev, "failed to populate children devices\n"); + return ret; + } } mdp_dev = device_find_child(dev, NULL, compare_name_mdp); From patchwork Fri Jul 10 23:02:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657523 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90F2E13B4 for ; Fri, 10 Jul 2020 23:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7618520767 for ; Fri, 10 Jul 2020 23:03:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="czcZnmWK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727096AbgGJXDO (ORCPT ); Fri, 10 Jul 2020 19:03:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbgGJXCv (ORCPT ); Fri, 10 Jul 2020 19:02:51 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B352C08E763 for ; Fri, 10 Jul 2020 16:02:51 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id gc15so4998708pjb.0 for ; Fri, 10 Jul 2020 16:02:51 -0700 (PDT) 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=Y5w7thCJ47LiXz+1HKLTnKORVAb6dWtKvGhWSiH+CyA=; b=czcZnmWK3uUzXU3jJUftlmd87xKqg1vh36GGnjurujBnUEgeXlC1M6Wca16FDUQn+1 yZj82s/zD8peaRgTCevChpsENm2MclhtbVlqV1ldKm3+JpWTwS2UBaCObUuYsJAEdxXc onrMx7dOMRZrpJlLHafrJXEdUPVfZeTEt2K9g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y5w7thCJ47LiXz+1HKLTnKORVAb6dWtKvGhWSiH+CyA=; b=hwsWtKxMzKqZlgLP1yGl7z3G0CeU2LtU9IRf7HNv4y9vNQQZARwKUrElCUFE2aVOeL evcvjoIIzEajBdHPEBUyvf5MIyFCnTOiDDQ06g8MqnvWfZaqA0Kl0CzvX9n+qYhaMGOM 6/8luM2kGLFWDY6KGPKnjR2VaHA5N4uiO5GzVzDoV009UUJiGs53yAKK+uFMpA6BDGvY Rbn9yGzjNVCC7Bq9/lfQcl7jo02BjzM6DzEZHtU9jkefHq/sHctIsIz9cF58gB8lrOjz ACeVqt5SeVwa41vZNlfaf+x8h0bA4Xle96j2ZlEIbGl1T5UjXIE30DoVJB8kjMyLderK gj5g== X-Gm-Message-State: AOAM532dHsgq0f4XG2gSrADQxAXl2Pqw02SJk743gJne8miUQzvGD+He jqsyIw8NLaAhqR2A142duZYByHoWPn0= X-Google-Smtp-Source: ABdhPJzLC+zTXfa46e2kfj0dmtwYoXm+w+JRkwViDCVwoTfSIS5JSFTH2m0RSp/FhlQFUwXtRHO+CA== X-Received: by 2002:a17:902:9a4b:: with SMTP id x11mr54096770plv.150.1594422171008; Fri, 10 Jul 2020 16:02:51 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:50 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 5/9] arm64: dts: qcom: sc7180: Add "simple-bus" to our mdss node Date: Fri, 10 Jul 2020 16:02:20 -0700 Message-Id: <20200710160131.5.I27644b643854c6deaae89c750041a5b69985b9d0@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As described in the bindings patch, this means that our child nodes are devices in their own right. Signed-off-by: Douglas Anderson --- If this patch lands before the patch ("drm/msm: Avoid manually populating our children if "simple-bus" is there") it doesn't seem to be the end of the world. The first time through add_display_components() it'll notice that the children are already populated and it will be a no-op. When it gets a defer it will then depouplate them (even though it didn't populate them) and future calls will just populate them again. arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 2be81a2a1512..cae6c69fd85a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2594,7 +2594,7 @@ camnoc_virt: interconnect@ac00000 { }; mdss: mdss@ae00000 { - compatible = "qcom,sc7180-mdss"; + compatible = "qcom,sc7180-mdss", "simple-bus"; reg = <0 0x0ae00000 0 0x1000>; reg-names = "mdss"; From patchwork Fri Jul 10 23:02:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C02713B1 for ; Fri, 10 Jul 2020 23:03:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62B8620849 for ; Fri, 10 Jul 2020 23:03:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="W05HtcQb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726900AbgGJXCy (ORCPT ); Fri, 10 Jul 2020 19:02:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbgGJXCx (ORCPT ); Fri, 10 Jul 2020 19:02:53 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DB43C08E876 for ; Fri, 10 Jul 2020 16:02:52 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id q17so2839625pls.9 for ; Fri, 10 Jul 2020 16:02:52 -0700 (PDT) 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=rE/FJ5cYzpFqRF8eT/aCqXqC9qh4D6JVTbyHc29pzro=; b=W05HtcQbPIXl89xuFzm4GPwHFSTzuwS6hsd6ixbS+qwJmURhFW+04wI+YdXhaXJdwf gZyBNbX0eJuS6UKNz9BnvMBF+eGM4d0cV+AzqPhAvOQ+M/XgJa0mXxXlTlscAKe2+ZEL ji+EXJAV1US4mTdKcZIuo2k2hlDCXBrobBLQw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rE/FJ5cYzpFqRF8eT/aCqXqC9qh4D6JVTbyHc29pzro=; b=tyG4VWQD23GFFHtVnnsO5zvqNN+pP4MYLBHjUh2PsMPvv3m5UuhcllDCYUHT5U3TyG uVkkUHQJkD0iuQ77Zg580dR7cV1hNUXelkIHSMXJJOUbnzLcUGkXk8D8dEyPggkYm4bF 6160cGz3MtA9sWjDJBRtlVCs5ohhqYLDb+Y2vsx1rpZh0RNrzl82O9YIIPA1WTSmLpgO 5tSCbjXhJHbeZ56xQGGrQPyde3cK9boFOJJkoiWpGgwNEykszy5x7IJqhUP0q5+GDUta h8F4UsyxXcjq7siB4ZJ/jV2OXOct4bU6GpAZjL7odV6AgiAQy3FMGNIfTsx9KgN1m4yz q/AA== X-Gm-Message-State: AOAM533/b6l1jLVVDITrX1YLY7YMn6l2XmdNbe8SAcnMO58qgMjSAAPl lCchokE2avkt39xOsd1j/79qXQ== X-Google-Smtp-Source: ABdhPJwjcX9D4B+Y8sp8rehAg+DrC8K54299WPrDi2IEEU/9tpv0fAIuMD/Nv1C71frqmllXTO8cGA== X-Received: by 2002:a17:902:6906:: with SMTP id j6mr18275162plk.125.1594422172084; Fri, 10 Jul 2020 16:02:52 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:51 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 6/9] arm64: dts: qcom: sdm845: Add "simple-bus" to our mdss node Date: Fri, 10 Jul 2020 16:02:21 -0700 Message-Id: <20200710160131.6.Ie343c226b3566575fcaa9e4a8732674a1ae1b513@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As described in the bindings patch, this means that our child nodes are devices in their own right. Signed-off-by: Douglas Anderson --- If this patch lands before the patch ("drm/msm: Avoid manually populating our children if "simple-bus" is there") it doesn't seem to be the end of the world. The first time through add_display_components() it'll notice that the children are already populated and it will be a no-op. When it gets a defer it will then depouplate them (even though it didn't populate them) and future calls will just populate them again. arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index b0d8308a3e95..e52a5e95168a 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -3582,7 +3582,7 @@ clock_camcc: clock-controller@ad00000 { }; mdss: mdss@ae00000 { - compatible = "qcom,sdm845-mdss"; + compatible = "qcom,sdm845-mdss", "simple-bus"; reg = <0 0x0ae00000 0 0x1000>; reg-names = "mdss"; From patchwork Fri Jul 10 23:02:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657517 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A87DC13B1 for ; Fri, 10 Jul 2020 23:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E58B20767 for ; Fri, 10 Jul 2020 23:03:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lq+MGkGp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727017AbgGJXCy (ORCPT ); Fri, 10 Jul 2020 19:02:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726989AbgGJXCy (ORCPT ); Fri, 10 Jul 2020 19:02:54 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF37C08E89D for ; Fri, 10 Jul 2020 16:02:53 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id j19so3147188pgm.11 for ; Fri, 10 Jul 2020 16:02:53 -0700 (PDT) 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=9Qsyzl86u0xp/Q3AsfuSrATvhmR+NH14naSidgeU2PQ=; b=lq+MGkGphLSf5MfibDTvyQhzb4kbnr6BuiTTOfoYVXvs6hnNVAZTeS4GzeWIxArgee Y/DxQGYcoFo+gk/NY0IejlYOm3y/3+wSh+PT17XFNxMNb8K+oQfFlM+FQezfd3als/7y 0D+mf6sp9cX0TEI2MsZR5iuiPVqiJ/+S4Grxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Qsyzl86u0xp/Q3AsfuSrATvhmR+NH14naSidgeU2PQ=; b=E9Lkgj4qx2zSledOg7xXZMJgyo6njTBzKzbmSlr7SkkasrEH3Mqn4YxAzfemeEY1pC 4mj/1Clmf7PuuZDXGqCYlQzQbDgYu4DmDP+sj6w7QUtOirRa30HZ4KFveYrLkssxj9E7 iM/B6FrrbxQ1CLhegq6tjDPlk/dEZPM/P/NIXzobuiA+vvf/s8N0QB6QQ502CrwXuHlo LOrbVy93lUcZd1C3MjLxp1IVlaCDZOtvgkeUOpQ1Xw+tzIqNiuLCr9RVr5OCV4v9swKu LNWBFilTQYEyMsi/yCYf3tPBbiWjfj4/yLgW0I7l+IGAnYkL/rEp28F5Lqvm43IsMkwp FMew== X-Gm-Message-State: AOAM533ulDhpmGtFrUnJdW0gVW2ZErd2uEweV9kuimzFbYloqwyRVjQG v7yLzebwNezmJsptWpLhKSk8dUBFnYs= X-Google-Smtp-Source: ABdhPJysOX+rXIvX5/wYSLxirccnx0NQRBQKy0k+Iygaxavdr8HbCK/P41qasElxbHYh6Os2dg4vCg== X-Received: by 2002:a62:5a45:: with SMTP id o66mr5243667pfb.43.1594422173149; Fri, 10 Jul 2020 16:02:53 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:52 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 7/9] arm64: dts: qcom: msm8916: Add "simple-bus" to our mdss node Date: Fri, 10 Jul 2020 16:02:22 -0700 Message-Id: <20200710160131.7.I1605593efa85e3c9260e64fe51aedd0524544d81@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As described in the bindings patch, this means that our child nodes are devices in their own right. Signed-off-by: Douglas Anderson --- If this patch lands before the patch ("drm/msm: Avoid manually populating our children if "simple-bus" is there") it doesn't seem to be the end of the world. The first time through add_display_components() it'll notice that the children are already populated and it will be a no-op. When it gets a defer it will then depouplate them (even though it didn't populate them) and future calls will just populate them again. NOTE: I have no way to test this patch, but I'm assuming it works OK? arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 67cae5f9e47e..491362fe02ac 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1023,7 +1023,7 @@ opp-19200000 { }; mdss: mdss@1a00000 { - compatible = "qcom,mdss"; + compatible = "qcom,mdss", "simple-bus"; reg = <0x1a00000 0x1000>, <0x1ac8000 0x3000>; reg-names = "mdss_phys", "vbif_phys"; From patchwork Fri Jul 10 23:02:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657515 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B95F013B4 for ; Fri, 10 Jul 2020 23:03:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A0C1120786 for ; Fri, 10 Jul 2020 23:03:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="BcS8K872" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727033AbgGJXDH (ORCPT ); Fri, 10 Jul 2020 19:03:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727038AbgGJXCz (ORCPT ); Fri, 10 Jul 2020 19:02:55 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 258C0C08C5DC for ; Fri, 10 Jul 2020 16:02:55 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id o22so3233612pjw.2 for ; Fri, 10 Jul 2020 16:02:55 -0700 (PDT) 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=/bGZQukgdvxpeO9P4CSAAgyZ7LH76RJIkGY9IX/WOgs=; b=BcS8K872KzDafnCAvS8hTMh2QRHiwdT9K3jScaFOUPgJFjZ13VQBHt7Y2Uk6bycC3s gFubY3kH6dpBie7TZ00tvqwBf2YvJK8IXh9opftUX+2Lcxu5HoLJMLtS5LHH1U4GHzV8 WUOgdIZLvuu9ghtGat46xqbYhTXSeOVqFMp/A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/bGZQukgdvxpeO9P4CSAAgyZ7LH76RJIkGY9IX/WOgs=; b=j0F37Sk1HVksWDIMpaQBwH0K+PB0l8RttxrcqDqranQq/xwPiVCHhs9xnBG2Y4j9ZF qFtbRpC0STc1c4B/DCy6AjWRkfwPpwL6u91nVdFpENPZOfaZSId1GPW5C6yrxZDygNyb 5vTmMLb4YC6uS1Yhd81Ly2/wnD7vG5B9p/1QI561ingbED2UeY/gxjLCySQX5T30HzZz A+iEaDYiRWk/pnmVWrMLtaF8jZcp20d2kDTB6J+WHdx/j6lrxTkdo/IIfhdc6cX5Cdfh mFPzf0KLluwcUFKBnFbWkzLGD7m1JbTyWMiyajb7xNJTGiorHW6d/2urA7tZ6ueS6SP1 wXFw== X-Gm-Message-State: AOAM532IxlpVBfCla5FbjDdYFjN24H6lTpY5ehr9HnO5mlwzyMi5aJbY kShHxzL79zY+ude8kolc5AwoIw== X-Google-Smtp-Source: ABdhPJzVWK4kKHNQXZpw08rHhXfVuWKYJIflqz8a/l8lIEhQwXnMNLvfwBAieMzQP16Ze01ezXBUxQ== X-Received: by 2002:a17:90a:2681:: with SMTP id m1mr7431338pje.204.1594422174680; Fri, 10 Jul 2020 16:02:54 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:54 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 8/9] arm64: dts: qcom: msm8996: Add "simple-bus" to our mdss node Date: Fri, 10 Jul 2020 16:02:23 -0700 Message-Id: <20200710160131.8.I7a02e4b37149190227bc03fd1027c8241d8d4f4a@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As described in the bindings patch, this means that our child nodes are devices in their own right. Signed-off-by: Douglas Anderson --- If this patch lands before the patch ("drm/msm: Avoid manually populating our children if "simple-bus" is there") it doesn't seem to be the end of the world. The first time through add_display_components() it'll notice that the children are already populated and it will be a no-op. When it gets a defer it will then depouplate them (even though it didn't populate them) and future calls will just populate them again. NOTE: I have no way to test this patch, but I'm assuming it works OK? arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 9951286db775..e303b0e644ac 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -499,7 +499,7 @@ mmcc: clock-controller@8c0000 { }; mdss: mdss@900000 { - compatible = "qcom,mdss"; + compatible = "qcom,mdss", "simple-bus"; reg = <0x00900000 0x1000>, <0x009b0000 0x1040>, From patchwork Fri Jul 10 23:02:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11657507 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3388F14E3 for ; Fri, 10 Jul 2020 23:03:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A899207D0 for ; Fri, 10 Jul 2020 23:03:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="l5ce6hjS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727080AbgGJXDB (ORCPT ); Fri, 10 Jul 2020 19:03:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727054AbgGJXC4 (ORCPT ); Fri, 10 Jul 2020 19:02:56 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39BDFC08E6DC for ; Fri, 10 Jul 2020 16:02:56 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id k5so2831175plk.13 for ; Fri, 10 Jul 2020 16:02:56 -0700 (PDT) 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=co3iFm8egyAhpjouB4wYZ2DsUz/fkVXl0yTaXVEDDSU=; b=l5ce6hjS0xdsv66VLkfTFe9rwljnNeJ2hAUFnEXltlcciTj3GGqnNyK32o3TZO5+uL hQu+6PL0ibJ1s2JdZyy9/nrbrSEwM2PdoIk8FFiIaYNRhJ1pg9Q1h6xsMGYxCxgIiy7t r7I75GuEvSq8lGjPgTHXgmf/mqfSk79NkurBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=co3iFm8egyAhpjouB4wYZ2DsUz/fkVXl0yTaXVEDDSU=; b=po7Ilzq3dEOiLTAWQzyuosvmLY4IKLcWl6QkQNu2JXUmP/p73CFdymOlhbw+9U9y1e cyUW9irBqbrxQenWiwNusp+i+I1WZX6+Q+b0sEVgTie/hSTNaFpa3DAYAA2ouR5jdE6u iVoO091OambSoFIz+pUXJ7XnHXsOUq44Ql/xuJI9ERSaLBs1qYQRml2J91OcBqM5DSub RQxxLLiQQIGxaWuGdLbyEm1ZcanA9u17wFr5qqgyRBcZZEJXq5WSBm+YrUM+L7TgHfdL HS44Del7gNqNYEsWV4PWJCIChwEqrIXXWc18qDL7uOxsvvfur1mw3qv1sv1u0Z8phmOO 76Mw== X-Gm-Message-State: AOAM530a87COCJrbDOlIZZg1ieAHnmtH9Ugz+YmnqfUXcYDV53hw9iXT s7LamCT6cEM8JbzjDAtQZHwmCA== X-Google-Smtp-Source: ABdhPJwAAHPNollF2qNbk1bn/dIvuDP118bo1zP5qg598VD2MSzTkTnoyhetCyghTdH9xKFShiITnw== X-Received: by 2002:a17:90a:7b84:: with SMTP id z4mr7749468pjc.106.1594422175761; Fri, 10 Jul 2020 16:02:55 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id my9sm7266836pjb.44.2020.07.10.16.02.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:02:55 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Rob Clark , Sean Paul , Andy Gross , Bjorn Andersson Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 9/9] ARM: dts: qcom: msm8974: Add "simple-bus" to our mdss node Date: Fri, 10 Jul 2020 16:02:24 -0700 Message-Id: <20200710160131.9.I667d728b2a99b1ed50df01a3e14483fa69babf0e@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200710230224.2265647-1-dianders@chromium.org> References: <20200710230224.2265647-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As described in the bindings patch, this means that our child nodes are devices in their own right. Signed-off-by: Douglas Anderson --- If this patch lands before the patch ("drm/msm: Avoid manually populating our children if "simple-bus" is there") it doesn't seem to be the end of the world. The first time through add_display_components() it'll notice that the children are already populated and it will be a no-op. When it gets a defer it will then depouplate them (even though it didn't populate them) and future calls will just populate them again. NOTE: I have no way to test this patch, but I'm assuming it works OK? arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 51f5f904f9eb..9f84c9fd716c 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1402,7 +1402,7 @@ cnoc: interconnect@fc480000 { mdss: mdss@fd900000 { status = "disabled"; - compatible = "qcom,mdss"; + compatible = "qcom,mdss", "simple-bus"; reg = <0xfd900000 0x100>, <0xfd924000 0x1000>; reg-names = "mdss_phys",