diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-01-23 01:36:56 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2018-01-23 01:37:14 -0800 |
| commit | 067fb26462f2c5dcfc8e40710fdfd7a2e8a181d2 (patch) | |
| tree | 35baddecbe98c908d4d08686d571c8c0a924e850 | |
| parent | 53734c54025fcf11d2a1e153bca2b682c4f36033 (diff) | |
| download | kernel-067fb26462f2c5dcfc8e40710fdfd7a2e8a181d2.tar.gz kernel-067fb26462f2c5dcfc8e40710fdfd7a2e8a181d2.tar.xz kernel-067fb26462f2c5dcfc8e40710fdfd7a2e8a181d2.zip | |
Fix for nouveau crash (rhbz 1513150)
| -rw-r--r-- | drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch | 49 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 54 insertions, 1 deletions
diff --git a/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch b/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch new file mode 100644 index 000000000..4516b9cc5 --- /dev/null +++ b/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch @@ -0,0 +1,49 @@ +From patchwork Sat Jan 6 15:59:41 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: drm/nouveau/disp/gf119: add missing drive vfunc ptr +From: Rob Clark <robdclark@gmail.com> +X-Patchwork-Id: 196301 +Message-Id: <20180106155951.8416-1-robdclark@gmail.com> +To: dri-devel@lists.freedesktop.org +Cc: David Airlie <airlied@linux.ie>, nouveau@lists.freedesktop.org, + Ben Skeggs <bskeggs@redhat.com>, linux-kernel@vger.kernel.org +Date: Sat, 6 Jan 2018 10:59:41 -0500 + +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 +Signed-off-by: Rob Clark <robdclark@gmail.com> +--- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c +index a2978a37b4f3..700fc754f28a 100644 +--- 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, diff --git a/kernel.spec b/kernel.spec index 3e6120b46..c69aa5515 100644 --- a/kernel.spec +++ b/kernel.spec @@ -674,7 +674,8 @@ Patch628: HID-rmi-Check-that-a-device-is-a-RMI-device-before-c.patch # rhbz1514969 Patch633: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch - +# rhbz 1513150 +Patch634: drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch # END OF PATCH DEFINITIONS @@ -2233,6 +2234,9 @@ fi # # %changelog +* Tue Jan 23 2018 Laura Abbott <labbott@fedoraproject.org> +- Fix for nouveau crash (rhbz 1513150) + * Thu Jan 18 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.14-300 - Add some ppc mitigations from upstream |