summaryrefslogtreecommitdiffstats
path: root/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-27 06:00:48 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-27 06:00:48 +0200
commite21addedc45543075a08e41ec9f737c2642ec117 (patch)
tree9abf42b856fe76b5dd47fde8086e206cea2b1e35 /0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
parent7c4a6bcef44e10150e40409c0e46f2aeb4504c0b (diff)
parentf96c39f21373fa19f795a45724c92b515124b0c7 (diff)
downloadkernel-e21addedc45543075a08e41ec9f737c2642ec117.tar.gz
kernel-e21addedc45543075a08e41ec9f737c2642ec117.tar.xz
kernel-e21addedc45543075a08e41ec9f737c2642ec117.zip
merge origin (rebase to 5.8)kernel-5.8.4-250.vanilla.knurd.1.fc32
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.patch26
1 files changed, 0 insertions, 26 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
deleted file mode 100644
index d8c1a93d5..000000000
--- a/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-