]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 17:07:55 +0000 (18:07 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 17:07:55 +0000 (18:07 +0100)
added patches:
drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch

queue-4.14/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch b/queue-4.14/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch
new file mode 100644 (file)
index 0000000..12cf78e
--- /dev/null
@@ -0,0 +1,48 @@
+From 1b5c7ef3d0d0610bda9b63263f7c5b7178d11015 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Sat, 6 Jan 2018 10:59:41 -0500
+Subject: drm/nouveau/disp/gf119: add missing drive vfunc ptr
+
+From: Rob Clark <robdclark@gmail.com>
+
+commit 1b5c7ef3d0d0610bda9b63263f7c5b7178d11015 upstream.
+
+Fixes broken dp on GF119:
+
+  Call Trace:
+   ? nvkm_dp_train_drive+0x183/0x2c0 [nouveau]
+   nvkm_dp_acquire+0x4f3/0xcd0 [nouveau]
+   nv50_disp_super_2_2+0x5d/0x470 [nouveau]
+   ? nvkm_devinit_pll_set+0xf/0x20 [nouveau]
+   gf119_disp_super+0x19c/0x2f0 [nouveau]
+   process_one_work+0x193/0x3c0
+   worker_thread+0x35/0x3b0
+   kthread+0x125/0x140
+   ? process_one_work+0x3c0/0x3c0
+   ? kthread_park+0x60/0x60
+   ret_from_fork+0x25/0x30
+  Code:  Bad RIP value.
+  RIP:           (null) RSP: ffffb1e243e4bc38
+  CR2: 0000000000000000
+
+Fixes: af85389c614a drm/nouveau/disp: shuffle functions around
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103421
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Cc: Sven Joachim <svenjoac@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+@@ -174,6 +174,7 @@ gf119_sor = {
+               .links = gf119_sor_dp_links,
+               .power = g94_sor_dp_power,
+               .pattern = gf119_sor_dp_pattern,
++              .drive = gf119_sor_dp_drive,
+               .vcpi = gf119_sor_dp_vcpi,
+               .audio = gf119_sor_dp_audio,
+               .audio_sym = gf119_sor_dp_audio_sym,
index 2a81752c869cbd44f088a270b804bdecb68795f6..98d0e9bc534f33af36281e2c8260cfd08d76bce5 100644 (file)
@@ -1 +1,2 @@
 tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
+drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch