Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-21 09:09:54 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-21 09:10:11 +0100
commit5e71d60b1c584e6bac178e8a94c77176c7dd6888 (patch)
tree1c78b089537167c161bdba29fe7d7bd9d7a711c6
parent87a0f3b3ab61754d48508604cd682cd98ce9ce77 (diff)
drm/nouveau/falcon: avoid touching registers if engine is off
(bsc#1051510).
-rw-r--r--patches.drm/drm-nouveau-falcon-avoid-touching-registers-if-engin.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.drm/drm-nouveau-falcon-avoid-touching-registers-if-engin.patch b/patches.drm/drm-nouveau-falcon-avoid-touching-registers-if-engin.patch
new file mode 100644
index 0000000000..db9777a994
--- /dev/null
+++ b/patches.drm/drm-nouveau-falcon-avoid-touching-registers-if-engin.patch
@@ -0,0 +1,45 @@
+From a5176a4cb85bb6213daadf691097cf411da35df2 Mon Sep 17 00:00:00 2001
+From: Ilia Mirkin <imirkin@alum.mit.edu>
+Date: Thu, 13 Dec 2018 22:44:08 -0500
+Subject: [PATCH] drm/nouveau/falcon: avoid touching registers if engine is off
+Git-commit: a5176a4cb85bb6213daadf691097cf411da35df2
+Patch-mainline: v5.0-rc2
+References: bsc#1051510
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980
+Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
+index 816ccaedfc73..8675613e142b 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
+@@ -22,6 +22,7 @@
+ #include <engine/falcon.h>
+
+ #include <core/gpuobj.h>
++#include <subdev/mc.h>
+ #include <subdev/timer.h>
+ #include <engine/fifo.h>
+
+@@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend)
+ }
+ }
+
+- nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
+- nvkm_wr32(device, base + 0x014, 0xffffffff);
++ if (nvkm_mc_enabled(device, engine->subdev.index)) {
++ nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
++ nvkm_wr32(device, base + 0x014, 0xffffffff);
++ }
+ return 0;
+ }
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b920f3f494..97594d4ff5 100644
--- a/series.conf
+++ b/series.conf
@@ -20248,6 +20248,7 @@
patches.fixes/rbd-don-t-return-0-on-unmap-if-rbd_dev_flag_removing-is-set.patch
patches.drivers/i2c-dev-prevent-adapter-retries-and-timeout-being-se.patch
patches.drm/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch
+ patches.drm/drm-nouveau-falcon-avoid-touching-registers-if-engin.patch
patches.drm/0001-drm-fb-helper-Partially-bring-back-workaround-for-bu.patch
patches.drm/0001-drm-fb-helper-Ignore-the-value-of-fb_var_screeninfo..patch
patches.fixes/kvm-sev-fail-kvm_sev_init-if-already-initialized.patch