From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDF5DC433B4 for ; Fri, 2 Apr 2021 11:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F0B1610CF for ; Fri, 2 Apr 2021 11:43:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F0B1610CF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E7CAE6E0DF; Fri, 2 Apr 2021 11:42:59 +0000 (UTC) Received: from m43-7.mailgun.net (m43-7.mailgun.net [69.72.43.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39A6A6E0DF for ; Fri, 2 Apr 2021 11:42:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1617363779; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=Y0ofDdUGn0WUo2hyxln+MKhIE2bhy/ms3A+4Ijw+Tas=; b=ZGHcGMP4qeQP+9Azc+06HxjQdq0OcMg8s6lEVHwYS/cJAnlnYoizVRNE92CJ/ejtcNKvFYFd 5lONXr6dbUa4xtlOQ5+T4oHdEPAN9uqTrE6FiS64HBtwJDKKhkXrhkHMlJe0xuWvPlosmd5S DRomCBr4Dj5enKR5k15QFq158U4= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyJkOTU5ZSIsICJkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n04.prod.us-east-1.postgun.com with SMTP id 606703248166b7eff7e91d7e (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Fri, 02 Apr 2021 11:42:28 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 600E2C43461; Fri, 2 Apr 2021 11:42:27 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: kalyan_t) by smtp.codeaurora.org (Postfix) with ESMTPSA id CFD51C433C6; Fri, 2 Apr 2021 11:42:25 +0000 (UTC) MIME-Version: 1.0 Date: Fri, 02 Apr 2021 17:12:25 +0530 From: kalyan_t@codeaurora.org To: Dmitry Baryshkov Subject: Re: [Freedreno] [v1] drm/msm/disp/dpu1: fix warn stack reported during dpu resume In-Reply-To: References: <1617190020-7931-1-git-send-email-kalyan_t@codeaurora.org> <84fdbdc7-7890-965a-bc6b-a19bd0ca4937@linaro.org> <96eb927abe1a22711709900cec7f8d11@codeaurora.org> Message-ID: <04b4612dfd3f651ead068725409211a0@codeaurora.org> X-Sender: kalyan_t@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Krishna Manikandan , linux-arm-msm , Daniel Hung-yu Wu , Linux Kernel Mailing List , dri-devel , Douglas Anderson , Matthias Kaehlcke , Michelle Dean , Steev Klimaszewski , freedreno , y@qualcomm.com Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2021-04-01 19:01, Dmitry Baryshkov wrote: > On Thu, 1 Apr 2021 at 16:19, wrote: >> >> On 2021-04-01 07:37, Dmitry Baryshkov wrote: >> > On 01/04/2021 01:47, Rob Clark wrote: >> >> On Wed, Mar 31, 2021 at 9:03 AM Dmitry Baryshkov >> >> wrote: >> >>> >> >>> On 31/03/2021 14:27, Kalyan Thota wrote: >> >>>> WARN_ON was introduced by the below commit to catch runtime resumes >> >>>> that are getting triggered before icc path was set. >> >>>> >> >>>> "drm/msm/disp/dpu1: icc path needs to be set before dpu runtime >> >>>> resume" >> >>>> >> >>>> For the targets where the bw scaling is not enabled, this WARN_ON is >> >>>> a false alarm. Fix the WARN condition appropriately. >> >>> >> >>> Should we change all DPU targets to use bw scaling to the mdp from >> >>> the >> >>> mdss nodes? The limitation to sc7180 looks artificial. >> >> >> >> yes, we should, this keeps biting us on 845 >> > >> > Done, >> > https://lore.kernel.org/linux-arm-msm/20210401020533.3956787-2-dmitry.baryshkov@linaro.org/ >> >> Hi Dmitry, >> >> https://lore.kernel.org/linux-arm-msm/20210401020533.3956787-2-dmitry.baryshkov@linaro.org/ >> >> you need to add clk_inefficiency_factor, bw_inefficiency_factor in the >> catalogue for the new >> targets where bw scaling is being enabled. please reuse sc7180 values. > > Done in patch 1 in that series. > got it. >> >> secondly, the AXI clock needs to be moved from mdss to mdp device like >> as in sc7180 dt if its not done already. > > Is this enough: > sm8250 has <&gcc GCC_DISP_HF_AXI_CLK> both in mdss and mdp nodes > sdm845 has <&gcc GCC_DISP_AXI_CLK> in mdss node and <&dispcc > DISP_CC_MDSS_AXI_CLK> in the mdp node. > > Since there is no BW vote in mdss, we need to move the AXI clock ON to > mdp node. for sm8250 remove GCC_DISP_HF_AXI_CLK from mdss device and add it in mdp device. for sdm845 remove GCC_DISP_AXI_CLK from mdss device and add it in mdp device before we turn on DISP_CC_MDSS_AXI_CLK, i.e as first item. >> >> lastly, if you are planning to remove the static votes from dpu_mdss, >> do >> you also want to move the >> interconnect paths from mdss device to mdp device in the dt ? > > I have no strong opinion on this. So far I did not change dt to be > compatible with the current device trees. > >> >> >> Thanks, >> Kalyan >> >> > >> >> >> >>>> >> >>>> Reported-by: Steev Klimaszewski >> >> >> >> Please add Fixes: tag as well >> Adding Fixes tag above my sign-off, should i push another version or >> can >> it be picked from here ? >> >> Fixes: 627dc55c273d ("drm/msm/disp/dpu1: icc path needs to be set >> before >> dpu runtime resume") >> >> >> >>>> Signed-off-by: Kalyan Thota >> >>>> --- >> >>>> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +++++--- >> >>>> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 9 +++++++++ >> >>>> drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 11 ++++++----- >> >>>> 3 files changed, 20 insertions(+), 8 deletions(-) >> >>>> >> >>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> >>>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> >>>> index cab387f..0071a4d 100644 >> >>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> >>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> >>>> @@ -294,6 +294,9 @@ static int >> >>>> dpu_kms_parse_data_bus_icc_path(struct dpu_kms *dpu_kms) >> >>>> struct icc_path *path1; >> >>>> struct drm_device *dev = dpu_kms->dev; >> >>>> >> >>>> + if (!dpu_supports_bw_scaling(dev)) >> >>>> + return 0; >> >>>> + >> >>>> path0 = of_icc_get(dev->dev, "mdp0-mem"); >> >>>> path1 = of_icc_get(dev->dev, "mdp1-mem"); >> >>>> >> >>>> @@ -934,8 +937,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) >> >>>> DPU_DEBUG("REG_DMA is not defined"); >> >>>> } >> >>>> >> >>>> - if (of_device_is_compatible(dev->dev->of_node, >> >>>> "qcom,sc7180-mdss")) >> >>>> - dpu_kms_parse_data_bus_icc_path(dpu_kms); >> >>>> + dpu_kms_parse_data_bus_icc_path(dpu_kms); >> >>>> >> >>>> pm_runtime_get_sync(&dpu_kms->pdev->dev); >> >>>> >> >>>> @@ -1198,7 +1200,7 @@ static int __maybe_unused >> >>>> dpu_runtime_resume(struct device *dev) >> >>>> >> >>>> ddev = dpu_kms->dev; >> >>>> >> >>>> - WARN_ON(!(dpu_kms->num_paths)); >> >>>> + WARN_ON((dpu_supports_bw_scaling(ddev) && >> >>>> !dpu_kms->num_paths)); >> >>>> /* Min vote of BW is required before turning on AXI clk */ >> >>>> for (i = 0; i < dpu_kms->num_paths; i++) >> >>>> icc_set_bw(dpu_kms->path[i], 0, >> >>>> Bps_to_icc(MIN_IB_BW)); >> >>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h >> >>>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h >> >>>> index d6717d6..f7bcc0a 100644 >> >>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h >> >>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h >> >>>> @@ -154,6 +154,15 @@ struct vsync_info { >> >>>> >> >>>> #define to_dpu_global_state(x) container_of(x, struct >> >>>> dpu_global_state, base) >> >>>> >> >>>> +/** >> >>>> + * dpu_supports_bw_scaling: returns true for drivers that support >> >>>> bw scaling. >> >>>> + * @dev: Pointer to drm_device structure >> >>>> + */ >> >>>> +static inline int dpu_supports_bw_scaling(struct drm_device *dev) >> >>>> +{ >> >>>> + return of_device_is_compatible(dev->dev->of_node, >> >>>> "qcom,sc7180-mdss"); >> >>>> +} >> >>>> + >> >>>> /* Global private object state for tracking resources that are >> >>>> shared across >> >>>> * multiple kms objects (planes/crtcs/etc). >> >>>> */ >> >>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c >> >>>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c >> >>>> index cd40788..8cd712c 100644 >> >>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c >> >>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c >> >>>> @@ -41,6 +41,9 @@ static int dpu_mdss_parse_data_bus_icc_path(struct >> >>>> drm_device *dev, >> >>>> struct icc_path *path0 = of_icc_get(dev->dev, "mdp0-mem"); >> >>>> struct icc_path *path1 = of_icc_get(dev->dev, "mdp1-mem"); >> >>>> >> >>>> + if (dpu_supports_bw_scaling(dev)) >> >>>> + return 0; >> >>>> + >> >>>> if (IS_ERR_OR_NULL(path0)) >> >>>> return PTR_ERR_OR_ZERO(path0); >> >>>> >> >>>> @@ -276,11 +279,9 @@ int dpu_mdss_init(struct drm_device *dev) >> >>>> >> >>>> DRM_DEBUG("mapped mdss address space @%pK\n", >> >>>> dpu_mdss->mmio); >> >>>> >> >>>> - if (!of_device_is_compatible(dev->dev->of_node, >> >>>> "qcom,sc7180-mdss")) { >> >>>> - ret = dpu_mdss_parse_data_bus_icc_path(dev, dpu_mdss); >> >>>> - if (ret) >> >>>> - return ret; >> >>>> - } >> >>>> + ret = dpu_mdss_parse_data_bus_icc_path(dev, dpu_mdss); >> >>>> + if (ret) >> >>>> + return ret; >> >>>> >> >>>> mp = &dpu_mdss->mp; >> >>>> ret = msm_dss_parse_clock(pdev, mp); >> >>>> >> >>> >> >>> >> >>> -- >> >>> With best wishes >> >>> Dmitry _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel