diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-29 09:39:00 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-29 09:39:00 -0500 |
commit | 60fd6260b95af92864e0038226b58de78d7fb9a6 (patch) | |
tree | 643583cd55e9412c3e4a2e810b5dd83d2d6340c5 /0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch | |
parent | 618d5f540f5dc8c702c4bdd6f65fa2455f7fb13e (diff) | |
download | kernel-60fd6260b95af92864e0038226b58de78d7fb9a6.tar.gz kernel-60fd6260b95af92864e0038226b58de78d7fb9a6.tar.xz kernel-60fd6260b95af92864e0038226b58de78d7fb9a6.zip |
Linux v5.7.6 rebase
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
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 + |