Fix for nouveau crash (rhbz 1513150)

This commit is contained in:
Laura Abbott 2018-01-23 01:36:56 -08:00
parent cc95f96a35
commit 81a9ddcc39
2 changed files with 55 additions and 0 deletions

View File

@ -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,

View File

@ -663,6 +663,9 @@ Patch628: HID-rmi-Check-that-a-device-is-a-RMI-device-before-c.patch
# rhbz 1514969
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
%endif
@ -2240,6 +2243,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