diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-01 17:07:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-01 17:07:26 +0200 |
commit | b24805024693adae5ceec06aace40e57d9029fd9 (patch) | |
tree | 29236f8e81188d1940b231351a3b4ec7e928871e /0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch | |
parent | 4f9aef74d72cad34127c11c93531f94f8dc665d4 (diff) | |
parent | 59aac79c260b00b5caad750024ad7421fa658702 (diff) | |
download | kernel-b24805024693adae5ceec06aace40e57d9029fd9.tar.gz kernel-b24805024693adae5ceec06aace40e57d9029fd9.tar.xz kernel-b24805024693adae5ceec06aace40e57d9029fd9.zip |
merge origin (rebase to 5.7)kernel-5.7.7-150.vanilla.knurd.1.fc31
Diffstat (limited to '0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch')
-rw-r--r-- | 0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch b/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch new file mode 100644 index 000000000..d8c1a93d5 --- /dev/null +++ b/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs@redhat.com> +Date: Wed, 6 May 2020 14:40:45 +1000 +Subject: [PATCH] disp/nv50-: increase timeout on pio channel free() polling + +Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +--- + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c +index 8c5cf096f69b..658a200ab616 100644 +--- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c ++++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c +@@ -32,7 +32,7 @@ + bool + curs507a_space(struct nv50_wndw *wndw) + { +- nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 2, ++ nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 100, + if (nvif_rd32(&wndw->wimm.base.user, 0x0008) >= 4) + return true; + ); +-- +2.26.2 + |