Re: [Freedreno] [RESEND 00/53] Rid GPU from W=1 warnings
On Fri, 19 Mar 2021, Daniel Vetter wrote: > On Fri, Mar 19, 2021 at 08:24:07AM +, Lee Jones wrote: > > On Thu, 18 Mar 2021, Daniel Vetter wrote: > > > > > On Wed, Mar 17, 2021 at 9:32 PM Daniel Vetter wrote: > > > > > > > > On Wed, Mar 17, 2021 at 9:17 AM Lee Jones wrote: > > > > > > > > > > On Thu, 11 Mar 2021, Lee Jones wrote: > > > > > > > > > > > On Thu, 11 Mar 2021, Daniel Vetter wrote: > > > > > > > > > > > > > On Mon, Mar 08, 2021 at 09:19:32AM +, Lee Jones wrote: > > > > > > > > On Fri, 05 Mar 2021, Roland Scheidegger wrote: > > > > > > > > > > > > > > > > > The vmwgfx ones look all good to me, so for > > > > > > > > > 23-53: Reviewed-by: Roland Scheidegger > > > > > > > > > That said, they were already signed off by Zack, so not sure > > > > > > > > > what > > > > > > > > > happened here. > > > > > > > > > > > > > > > > Yes, they were accepted at one point, then dropped without a > > > > > > > > reason. > > > > > > > > > > > > > > > > Since I rebased onto the latest -next, I had to pluck them back > > > > > > > > out of > > > > > > > > a previous one. > > > > > > > > > > > > > > They should show up in linux-next again. We merge patches for > > > > > > > next merge > > > > > > > window even during the current merge window, but need to make > > > > > > > sure they > > > > > > > don't pollute linux-next. Occasionally the cut off is wrong so > > > > > > > patches > > > > > > > show up, and then get pulled again. > > > > > > > > > > > > > > Unfortunately especially the 5.12 merge cycle was very wobbly due > > > > > > > to some > > > > > > > confusion here. But your patches should all be in linux-next > > > > > > > again (they > > > > > > > are queued up for 5.13 in drm-misc-next, I checked that). > > > > > > > > > > > > > > Sorry for the confusion here. > > > > > > > > > > > > Oh, I see. Well so long as they don't get dropped, I'll be happy. > > > > > > > > > > > > Thanks for the explanation Daniel > > > > > > > > > > After rebasing today, all of my GPU patches have remained. Would > > > > > someone be kind enough to check that everything is still in order > > > > > please? > > > > > > > > It's still broken somehow. I've kiced Maxime and Maarten again, > > > > they're also on this thread. > > > > > > You're patches have made it into drm-next meanwhile, so they should > > > show up in linux-next through that tree at least. Except if that one > > > also has some trouble. > > > > Thanks for letting me know. > > > > I see some patches made it back in, others didn't. > > > > I'll resend the stragglers - bear with. > > The vmwgfx ones should all be back, the others I guess just werent ever > applied. I'll vacuum them all up if you resend. Apologies for the wobbly > ride. NP, it happens. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
[Freedreno] [v1] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
From: Kalyan Thota
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
---
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 4ULL /* 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) {
--
2.7.4
___
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [PATCH] gpu/drm/msm: fix shutdown hook in case GPU components failed to bind
On Fri, 19 Mar 2021 at 19:25, Fabio Estevam wrote: > > On Fri, Mar 19, 2021 at 12:13 PM Fabio Estevam wrote: > > > Thanks for the feedback. > > I will follow the same approach for fixing the suspend/resume path then. > > > > Let me test it and then I will re-submit Dmitry's patch and the one > > for suspend/resume as part of a patch series. > > This approach works here for the suspend/resume path too. > > I have just submitted the series, thanks. Thank you! -- With best wishes Dmitry ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
[Freedreno] [PATCH] drm/msm/dpu: Fix a typo
s/poiner/pointer/ Signed-off-by: Bhaskar Chowdhury --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index d6717d6672f7..a448eb039334 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -258,7 +258,7 @@ void dpu_kms_encoder_enable(struct drm_encoder *encoder); /** * dpu_kms_get_clk_rate() - get the clock rate - * @dpu_kms: poiner to dpu_kms structure + * @dpu_kms: pointer to dpu_kms structure * @clock_name: clock name to get the rate * * Return: current clock rate -- 2.31.0 ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [PATCH] drm/msm/dpu: Fix a typo
On 3/22/21 5:06 AM, Bhaskar Chowdhury wrote: > > s/poiner/pointer/ > > Signed-off-by: Bhaskar Chowdhury Acked-by: Randy Dunlap > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > index d6717d6672f7..a448eb039334 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > @@ -258,7 +258,7 @@ void dpu_kms_encoder_enable(struct drm_encoder *encoder); > > /** > * dpu_kms_get_clk_rate() - get the clock rate > - * @dpu_kms: poiner to dpu_kms structure > + * @dpu_kms: pointer to dpu_kms structure > * @clock_name: clock name to get the rate > * > * Return: current clock rate > -- -- ~Randy ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [PATCH] drm/msm/dpu: Fix a typo
On 3/21/21 11:27 PM, Bhaskar Chowdhury wrote:
>
> s/struture/structure/
>
> Signed-off-by: Bhaskar Chowdhury
Acked-by: Randy Dunlap
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> index 09a3fb3e89f5..bb9ceadeb0bb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> @@ -343,7 +343,7 @@ enum dpu_3d_blend_mode {
>
> /** struct dpu_format - defines the format configuration which
> * allows DPU HW to correctly fetch and decode the format
> - * @base: base msm_format struture containing fourcc code
> + * @base: base msm_format structure containing fourcc code
> * @fetch_planes: how the color components are packed in pixel format
> * @element: element color ordering
> * @bits: element bit widths
> --
--
~Randy
___
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [v1] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
On Mon, Mar 22, 2021 at 02:17:12AM -0700, Kalyan Thota wrote: > From: Kalyan Thota > > 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 Confirmed that this fixes a bunch of warnings at boot on SC7180 when (out-of-tree) camera support is enabled: [1.832228] gcc_disp_hf_axi_clk status stuck at 'off' [2.118292] gcc_disp_hf_axi_clk status stuck at 'off' [2.442383] gcc_disp_hf_axi_clk already disabled [2.750054] gcc_disp_hf_axi_clk already unprepared [3.154835] gcc_disp_hf_axi_clk already disabled [3.421835] gcc_disp_hf_axi_clk already unprepared Tested-by: Matthias Kaehlcke ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [v1] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
On Mon, Mar 22, 2021 at 5:44 PM Matthias Kaehlcke wrote: > > On Mon, Mar 22, 2021 at 02:17:12AM -0700, Kalyan Thota wrote: > > From: Kalyan Thota > > > > 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 > > Confirmed that this fixes a bunch of warnings at boot on SC7180 when > (out-of-tree) camera support is enabled: > > [1.832228] gcc_disp_hf_axi_clk status stuck at 'off' > [2.118292] gcc_disp_hf_axi_clk status stuck at 'off' > [2.442383] gcc_disp_hf_axi_clk already disabled > [2.750054] gcc_disp_hf_axi_clk already unprepared > [3.154835] gcc_disp_hf_axi_clk already disabled > [3.421835] gcc_disp_hf_axi_clk already unprepared > > Tested-by: Matthias Kaehlcke thanks for testing on the setup which had this issue.. I've pushed to msm-next BR, -R ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [Freedreno] [PATCH] drm/msm/dp: Fixed couple of typos
Quoting Bhaskar Chowdhury (2021-03-17 23:26:50) > s/modueles/modules/ two different places > > Signed-off-by: Bhaskar Chowdhury > --- Reviewed-by: Stephen Boyd ___ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno
