diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
commit | d8b1d4104de663bacffe18cf79ebf37fed8aac78 (patch) | |
tree | 2aceb7beb9cb45d90854d2d8e36ce108864fca46 /0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch | |
parent | 1b44a8c9fe0e71a8d14c49e78d9857f49d518a09 (diff) | |
parent | 9ab9ea2db0b13375d3d7114d5c82eb298a118740 (diff) | |
download | kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.gz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.xz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.zip |
merge origin
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, 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 - |