Skip to contentSkip to conversation

gpu: host1x: Fix hang on Tegra186+

PATCH Applied Dmitry Osipenko 2 participants 2 messages Dec 23, 2021 – Jan 27, 2022

Subsystems (3)
DRM drivers Tegra architecture support DRM drivers for NVIDIA Tegra
lore
Share & tools
lore

Dmitry Osipenko

author
#0 lore raw

PATCH 1/1 gpu: host1x: Fix hang on Tegra186+

Tegra186+ hangs if host1x hardware is disabled at a kernel boot time because we touch hardware before runtime PM is resumed. Move sync point assignment initialization to the RPM-resume callback. Older SoCs were unaffected because they skip that sync point initialization.

Tested-by Jon Hunter <[email protected]> # T186
Reported-by Jon Hunter <[email protected]> # T186
Fixes 6b6776e2ab8a ("gpu: host1x: Add initial runtime PM and OPP support")
Signed-off-by Dmitry Osipenko <[email protected]>
---
 drivers/gpu/host1x/syncpt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/host1x/syncpt.c +8 -8
index e08e331e46ae..83a16e46146b 100644
@@ -137,8 +137,15 @@ void host1x_syncpt_restore(struct host1x *host)
 	struct host1x_syncpt *sp_base = host->syncpt;
 	unsigned int i;
 
-	for (i = 0; i < host1x_syncpt_nb_pts(host); i++)
+	for (i = 0; i < host1x_syncpt_nb_pts(host); i++) {
+		/*
+		 * Unassign syncpt from channels for purposes of Tegra186
+		 * syncpoint protection. This prevents any channel from
+		 * accessing it until it is reassigned.
+		 */
+		host1x_hw_syncpt_assign_to_channel(host, sp_base + i, NULL);
 		host1x_hw_syncpt_restore(host, sp_base + i);
+	}
 
 	for (i = 0; i < host1x_syncpt_nb_bases(host); i++)
 		host1x_hw_syncpt_restore_wait_base(host, sp_base + i);

@@ -352,13 +359,6 @@ int host1x_syncpt_init(struct host1x *host)
 	for (i = 0; i < host->info->nb_pts; i++) {
 		syncpt[i].id = i;
 		syncpt[i].host = host;
-
-		/*
-		 * Unassign syncpt from channels for purposes of Tegra186
-		 * syncpoint protection. This prevents any channel from
-		 * accessing it until it is reassigned.
-		 */
-		host1x_hw_syncpt_assign_to_channel(host, &syncpt[i], NULL);
 	}
 
 	for (i = 0; i < host->info->nb_bases; i++)
Signature · 1 line
2.33.1
Applied
#1 lore raw
Quoted 5 lines · Dmitry Osipenko

Tegra186+ hangs if host1x hardware is disabled at a kernel boot time because we touch hardware before runtime PM is resumed. Move sync point assignment initialization to the RPM-resume callback. Older SoCs were unaffected because they skip that sync point initialization.

Quoted 7 lines
Tested-by Jon Hunter <[email protected]> # T186
Reported-by Jon Hunter <[email protected]> # T186
Fixes 6b6776e2ab8a ("gpu: host1x: Add initial runtime PM and OPP support")
Signed-off-by Dmitry Osipenko <[email protected]>
---
 drivers/gpu/host1x/syncpt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Applied, thanks.

Thierry