Messages in this thread | | | Date | Wed, 31 Mar 2021 18:04:23 +0530 | From | kalyan_t@codeauro ... | Subject | Re: [Freedreno] [v1] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume |
| |
On 2021-03-31 00:04, Steev Klimaszewski wrote: > On 3/22/21 4:17 AM, Kalyan Thota wrote: >> From: Kalyan Thota <kalyant@codeaurora.org> >> >> DPU runtime resume will request for a min vote on the AXI bus as >> it is a necessary step before turning ON the AXI clock. >> >> The change does below >> 1) Move the icc path set before requesting runtime get_sync. >> 2) remove the dependency of hw catalog for min ib vote >> as it is initialized at a later point. >> >> Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org> >> --- >> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 +++++++----- >> 1 file changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> index ed636f1..cab387f 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> @@ -44,6 +44,8 @@ >> #define DPU_DEBUGFS_DIR "msm_dpu" >> #define DPU_DEBUGFS_HWMASKNAME "hw_log_mask" >> >> +#define MIN_IB_BW 400000000ULL /* Min ib vote 400MB */ >> + >> static int dpu_kms_hw_init(struct msm_kms *kms); >> static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms); >> >> @@ -932,6 +934,9 @@ 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); >> + >> pm_runtime_get_sync(&dpu_kms->pdev->dev); >> >> dpu_kms->core_rev = readl_relaxed(dpu_kms->mmio + 0x0); >> @@ -1037,9 +1042,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms) >> >> dpu_vbif_init_memtypes(dpu_kms); >> >> - if (of_device_is_compatible(dev->dev->of_node, "qcom,sc7180-mdss")) >> - dpu_kms_parse_data_bus_icc_path(dpu_kms); >> - >> pm_runtime_put_sync(&dpu_kms->pdev->dev); >> >> return 0; >> @@ -1196,10 +1198,10 @@ static int __maybe_unused >> dpu_runtime_resume(struct device *dev) >> >> ddev = dpu_kms->dev; >> >> + WARN_ON(!(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, >> - dpu_kms->catalog->perf.min_dram_ib); >> + icc_set_bw(dpu_kms->path[i], 0, Bps_to_icc(MIN_IB_BW)); >> >> rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true); >> if (rc) { > > With this patch now applied to 5.12-rc5, I am seeing the following when > booting the Lenovo Yoga C630 - > > Mar 30 13:16:03 c630 kernel: [ 2.038491] ------------[ cut here > ]------------ > Mar 30 13:16:03 c630 kernel: [ 2.038495] WARNING: CPU: 3 PID: 125 > at drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c:1196 > dpu_runtime_resume+0xc0/0xf0 [msm] > Mar 30 13:16:03 c630 kernel: [ 2.038551] Modules linked in: > ti_sn65dsi86 i2c_hid_of crct10dif_ce msm rtc_pm8xxx llcc_qcom ocmem > drm_kms_helper i2c_qcom_geni phy_qcom_qusb2 ipa(+) qcom_common > qcom_glink_smem qmi_helpers mdt_loader panel_simple drm pwm_bl > Mar 30 13:16:03 c630 kernel: [ 2.038599] CPU: 3 PID: 125 Comm: > kworker/3:1 Not tainted 5.12.0-rc5 #1 > Mar 30 13:16:03 c630 kernel: [ 2.038605] Hardware name: LENOVO > 81JL/LNVNB161216, BIOS 9UCN33WW(V2.06) 06/ 4/2019 > Mar 30 13:16:03 c630 kernel: [ 2.038610] Workqueue: events > deferred_probe_work_func > Mar 30 13:16:03 c630 kernel: [ 2.038621] pstate: 60400005 (nZCv > daif +PAN -UAO -TCO BTYPE=--) > Mar 30 13:16:03 c630 kernel: [ 2.038627] pc : > dpu_runtime_resume+0xc0/0xf0 [msm] > Mar 30 13:16:03 c630 kernel: [ 2.038674] lr : > pm_generic_runtime_resume+0x30/0x50 > Mar 30 13:16:03 c630 kernel: [ 2.038683] sp : ffff800010b9b7e0 > Mar 30 13:16:03 c630 kernel: [ 2.038685] x29: ffff800010b9b7e0 x28: > 0000000000000000 > Mar 30 13:16:03 c630 kernel: [ 2.038692] x27: 0000000000000000 x26: > ffff6b42c0c16cf4 > Mar 30 13:16:03 c630 kernel: [ 2.038698] x25: 000000007965f7df x24: > 0000000000000001 > Mar 30 13:16:03 c630 kernel: [ 2.038705] x23: ffff6b42c0a34180 x22: > ffffda2e0cc5b3d0 > Mar 30 13:16:03 c630 kernel: [ 2.038712] x21: ffffda2e0b3ed6a0 x20: > ffff6b42c6845000 > Mar 30 13:16:03 c630 kernel: [ 2.038718] x19: ffff6b42c6851080 x18: > ffffda2e0cce1220 > Mar 30 13:16:03 c630 kernel: [ 2.038725] x17: ffffda2e0cce1238 x16: > ffffda2e0b23e5f0 > Mar 30 13:16:03 c630 kernel: [ 2.038731] x15: 0000000040000000 x14: > 0000000000000000 > Mar 30 13:16:03 c630 kernel: [ 2.038738] x13: ffff6b42c5f0b5b0 x12: > 0000000000000000 > Mar 30 13:16:03 c630 kernel: [ 2.038744] x11: 0000000000000001 x10: > 0000000000003fff > Mar 30 13:16:03 c630 kernel: [ 2.038750] x9 : 0000000000000000 x8 : > 0000000000000000 > Mar 30 13:16:03 c630 kernel: [ 2.038755] x7 : 0000000000000000 x6 : > 000000000c473b7e > Mar 30 13:16:03 c630 kernel: [ 2.038761] x5 : 00ffffffffffffff x4 : > 00221806fff8f800 > Mar 30 13:16:03 c630 kernel: [ 2.038768] x3 : 0000000000000018 x2 : > ffffda2dc3d34320 > Mar 30 13:16:03 c630 kernel: [ 2.038774] x1 : 0000000000000000 x0 : > 0000000000000000 > Mar 30 13:16:03 c630 kernel: [ 2.038781] Call trace: > Mar 30 13:16:03 c630 kernel: [ 2.038784] > dpu_runtime_resume+0xc0/0xf0 [msm] > Mar 30 13:16:03 c630 kernel: [ 2.038831] > pm_generic_runtime_resume+0x30/0x50 > Mar 30 13:16:03 c630 kernel: [ 2.038836] > __genpd_runtime_resume+0x30/0xb0 > Mar 30 13:16:03 c630 kernel: [ 2.038842] > genpd_runtime_resume+0x90/0x250 > Mar 30 13:16:03 c630 kernel: [ 2.038848] __rpm_callback+0x90/0x160 > Mar 30 13:16:03 c630 kernel: [ 2.038854] rpm_callback+0x24/0x84 > Mar 30 13:16:03 c630 kernel: [ 2.038859] rpm_resume+0x450/0x6ec > Mar 30 13:16:03 c630 kernel: [ 2.038865] > __pm_runtime_resume+0x3c/0x90 > Mar 30 13:16:03 c630 kernel: [ 2.038870] > dpu_kms_hw_init+0x124/0x5dc [msm] > Mar 30 13:16:03 c630 kernel: [ 2.038918] msm_drm_bind+0x468/0x594 > [msm] > Mar 30 13:16:03 c630 kernel: [ 2.038965] > try_to_bring_up_master+0x164/0x1d0 > Mar 30 13:16:03 c630 kernel: [ 2.038973] > component_master_add_with_match+0xb8/0x100 > Mar 30 13:16:03 c630 kernel: [ 2.038979] msm_pdev_probe+0x260/0x300 > [msm] > Mar 30 13:16:03 c630 kernel: [ 2.039026] platform_probe+0x68/0xe0 > Mar 30 13:16:03 c630 kernel: [ 2.039032] really_probe+0xe4/0x4c0 > Mar 30 13:16:03 c630 kernel: [ 2.039036] > driver_probe_device+0x58/0xc0 > Mar 30 13:16:03 c630 kernel: [ 2.039040] > __device_attach_driver+0xa8/0x104 > Mar 30 13:16:03 c630 kernel: [ 2.039045] bus_for_each_drv+0x78/0xd0 > Mar 30 13:16:03 c630 kernel: [ 2.039051] __device_attach+0xd8/0x17c > Mar 30 13:16:03 c630 kernel: [ 2.039055] > device_initial_probe+0x14/0x20 > Mar 30 13:16:03 c630 kernel: [ 2.039059] bus_probe_device+0x9c/0xa4 > Mar 30 13:16:03 c630 kernel: [ 2.039065] > deferred_probe_work_func+0x74/0xb0 > Mar 30 13:16:03 c630 kernel: [ 2.039069] > process_one_work+0x1d0/0x494 > Mar 30 13:16:03 c630 kernel: [ 2.039076] worker_thread+0x13c/0x470 > Mar 30 13:16:03 c630 kernel: [ 2.039080] kthread+0x158/0x160 > Mar 30 13:16:03 c630 kernel: [ 2.039085] ret_from_fork+0x10/0x34 > Mar 30 13:16:03 c630 kernel: [ 2.039093] ---[ end trace > 65a4c9cc3f59c59a ]--- > Mar 30 13:16:03 c630 kernel: [ 2.039124] [drm:dpu_kms_hw_init:943] > dpu hardware revision:0x40000000 > Hi Steev,
The WARN_ON is true only for the device with compatible "qcom,sc7180-mdss". For other devices its a false alarm. Can you please try with the below change ?
https://patchwork.kernel.org/project/linux-arm-msm/patch/1617190020-7931-1-git-send-email-kalyan_t@codeaurora.org/
Thanks, Kalyan
> _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno
| |