drm/tegra: dc: Restore coupling of display controllers
PATCH 1/1 drm/tegra: dc: Restore coupling of display controllers
From: Thierry Reding <[email protected]>
Coupling of display controllers used to rely on runtime PM to take the companion controller out of reset. Commit fd67e9c6ed5a ("drm/tegra: Do not implement runtime PM") accidentally broke this when runtime PM was removed.
Restore this functionality by reusing the hierarchical host1x client suspend/resume infrastructure that's similar to runtime PM and which perfectly fits this use-case.
--- drivers/gpu/drm/tegra/dc.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/gpu/drm/tegra/dc.c +8 -12
@@ -2519,22 +2519,18 @@ static int tegra_dc_couple(struct tegra_dc *dc)* POWER_CONTROL registers during CRTC enabling. */ if (dc->soc->coupled_pm && dc->pipe ==1 ) { -u32 flags =DL_FLAG_PM_RUNTIME |DL_FLAG_AUTOREMOVE_CONSUMER ; -struct device_link *link; -struct device *partner; +struct device *companion; +struct tegra_dc *parent; - partner =driver_find_device (dc->dev->driver,NULL ,NULL , - tegra_dc_match_by_pipe); -if (!partner) + companion =driver_find_device (dc->dev->driver,NULL , (const void *)0 , + tegra_dc_match_by_pipe); +if (!companion)return -EPROBE_DEFER ; - link =device_link_add (dc->dev, partner, flags); -if (!link) { -dev_err (dc->dev,"failed to link controllers\n" ); -return -EINVAL ; - } + parent =dev_get_drvdata (companion); + dc->client.parent = &parent->client; -dev_dbg (dc->dev,"coupled to %s\n" ,dev_name (partner)); +dev_dbg (dc->dev,"coupled to %s\n" ,dev_name (companion)); }return 0 ;
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
19.03.2021 10:06, Thierry Reding пишет:
Quoted 7 lines
From: Thierry Reding <[email protected]>
Coupling of display controllers used to rely on runtime PM to take the companion controller out of reset. Commit
fd67e9c6ed5a("drm/tegra: Do not implement runtime PM") accidentally broke this when runtime PM was removed.
Quoted 7 lines
Restore this functionality by reusing the hierarchical host1x client suspend/resume infrastructure that's similar to runtime PM and which perfectly fits this use-case.
Fixes fd67e9c6ed5a ("drm/tegra: Do not implement runtime PM")Reported-by Dmitry Osipenko <[email protected]>Signed-off-by Thierry Reding <[email protected]>
Hi,
This bug was originally reported by Paul Fertser, I redirected it to you.
Formally, the stable kernel needs to be CCed since we want to have this patch applied to the stable kernels.
Otherwise this is good to me, thank you!
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel