drm/nouveau/bar/gk20a: Avoid bar teardown during init
Subsystems (3)
PATCH 1/1 drm/nouveau/bar/gk20a: Avoid bar teardown during init
Commit bbb163e18960 ("drm/nouveau/bar: implement bar1 teardown") introduced add a teardown helper function for BAR1. During initialisation of the Nouveau, initially all the teardown helpers are called once, before calling their init counterparts. For gk20a, after the BAR1 teardown function is called, the device is hanging during the initialisation of the FB sub-device. At this point it is unclear why this is happening and this is still under investigation. However, this change is preventing Tegra124 devices from booting when Nouveau is enabled. To allow Tegra124 to boot, remove the teardown helper for gk20a.
This is based upon a previous patch by Guillaume Tucker but limits the workaround to only gk20a GPUs.
---
I am not happy that we do not yet fully understand the cause of the hang, but I am talking with a few people at NVIDIA about this and have a few things to look into. However, given that we are close to v4.15 being released and I am not sure we will have a proper fix in place before, I think it is best to workaround this for now.
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 ++- drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c +2 -1
@@ -73,7 +73,8 @@ static int nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend) {struct nvkm_bar *bar =nvkm_bar (subdev); - bar->func->bar1.fini (bar); +if (bar->func->bar1.fini) + bar->func->bar1.fini (bar);return 0 ; }
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c +0 -1
@@ -26,7 +26,6 @@ gk20a_bar_func = { .dtor = gf100_bar_dtor, .oneinit = gf100_bar_oneinit, .bar1.init = gf100_bar_bar1_init, - .bar1.fini = gf100_bar_bar1_fini, .bar1.wait = gf100_bar_bar1_wait, .bar1.vmm = gf100_bar_bar1_vmm, .flush = g84_bar_flush,
Signature · 6 lines
2.7.4 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
Quoted 25 lines · Jon Hunter
Commit
bbb163e18960("drm/nouveau/bar: implement bar1 teardown") introduced add a teardown helper function for BAR1. During initialisation of the Nouveau, initially all the teardown helpers are called once, before calling their init counterparts. For gk20a, after the BAR1 teardown function is called, the device is hanging during the initialisation of the FB sub-device. At this point it is unclear why this is happening and this is still under investigation. However, this change is preventing Tegra124 devices from booting when Nouveau is enabled. To allow Tegra124 to boot, remove the teardown helper for gk20a.This is based upon a previous patch by Guillaume Tucker but limits the workaround to only gk20a GPUs.
Fixes bbb163e18960 ("drm/nouveau/bar: implement bar1 teardown")Reported-by Guillaume Tucker <[email protected]>Signed-off-by Jon Hunter <[email protected]>---
I am not happy that we do not yet fully understand the cause of the hang, but I am talking with a few people at NVIDIA about this and have a few things to look into. However, given that we are close to v4.15 being released and I am not sure we will have a proper fix in place before, I think it is best to workaround this for now.
Quoted 3 lines
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 ++- drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Guillaume Tucker
Tested-byQuoted 26 lines · Thierry Reding
Quoted 25 lines · Jon Hunter
Commit
bbb163e18960("drm/nouveau/bar: implement bar1 teardown") introduced add a teardown helper function for BAR1. During initialisation of the Nouveau, initially all the teardown helpers are called once, before calling their init counterparts. For gk20a, after the BAR1 teardown function is called, the device is hanging during the initialisation of the FB sub-device. At this point it is unclear why this is happening and this is still under investigation. However, this change is preventing Tegra124 devices from booting when Nouveau is enabled. To allow Tegra124 to boot, remove the teardown helper for gk20a.This is based upon a previous patch by Guillaume Tucker but limits the workaround to only gk20a GPUs.
Fixes bbb163e18960 ("drm/nouveau/bar: implement bar1 teardown")Reported-by Guillaume Tucker <[email protected]>Signed-off-by Jon Hunter <[email protected]>---
I am not happy that we do not yet fully understand the cause of the hang, but I am talking with a few people at NVIDIA about this and have a few things to look into. However, given that we are close to v4.15 being released and I am not sure we will have a proper fix in place before, I think it is best to workaround this for now.
Quoted 5 lines
Quoted 3 lines
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 ++- drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)Acked-by Thierry Reding <[email protected]>
https://lava.collabora.co.uk/scheduler/job/1047172
Thanks for this workaround. Looking forward to having this platform back on track in mainline. I'm happy to run this boot test again with a proper fix in future patches, let me know if I can be of any help.
Guillaume