From c4e3d4392fde4a202499e9fa449cc9a72a641961 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 9 Sep 2024 09:51:03 +0000 Subject: [PATCH] drm/amd/display: Don't use fsleep for PSR exit waits on dmub replay From Nicholas Kazlauskas da696cbb47941c40b01cc10ea5504dc5a4ebac6e in linux-6.6.y/6.6.50 b5236da757adc75d7e52c69bdc233d29249a0d0c in mainline linux --- sys/dev/pci/drm/amd/display/dc/dce/dmub_replay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/display/dc/dce/dmub_replay.c b/sys/dev/pci/drm/amd/display/dc/dce/dmub_replay.c index 28149e53c2a..eeb5b8247c9 100644 --- a/sys/dev/pci/drm/amd/display/dc/dce/dmub_replay.c +++ b/sys/dev/pci/drm/amd/display/dc/dce/dmub_replay.c @@ -102,7 +102,8 @@ static void dmub_replay_enable(struct dmub_replay *dmub, bool enable, bool wait, break; } - fsleep(500); + /* must *not* be fsleep - this can be called from high irq levels */ + udelay(500); } /* assert if max retry hit */ -- 2.20.1