rpms/kernel
8
2
Fork 4
Code Issues Pull Requests Releases Activity

Fix blank screen on some nvidia cards (rbhz 1351205)

Browse Source
This commit is contained in:
Josh Boyer 2016-07-07 08:27:15 -04:00
parent 202a693fe9
commit 884f5d7609
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch Normal file
View File

@ -0,0 +1,29 @@
From 217215041b9285af2193a755b56a8f3ed408bfe2 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 6 Jul 2016 06:50:36 +1000
Subject: [PATCH] drm/nouveau/disp/sor/gf119: select correct sor when poking
training pattern
Fixes a regression caused by a stupid thinko from "disp/sor/gf119: both
links use the same training register".
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
index 22706c0..49bd5da 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
@@ -40,7 +40,8 @@ static int
gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
{
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
- nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);
+ const u32 soff = gf119_sor_soff(outp);
+ nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, 0x01010101 * pattern);
return 0;
}

6
kernel.spec
View File

@ -624,6 +624,9 @@ Patch815: 0015-drm-i915-gen9-Calculate-watermarks-during-atomic-che.patch
Patch816: 0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch Patch816: 0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch
Patch817: 0017-drm-i915-Remove-wm_config-from-dev_priv-intel_atomic.patch Patch817: 0017-drm-i915-Remove-wm_config-from-dev_priv-intel_atomic.patch
#rbhz 1351205
Patch833: drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %endif
@ -2149,6 +2152,9 @@ fi
# #
# #
%changelog %changelog
* Thu Jul 07 2016 Josh Boyer <jwboyer@fedoraproject.org>
- Fix blank screen on some nvidia cards (rbhz 1351205)
* Thu Jul 7 2016 Peter Robinson <pbrobinson@fedoraproject.org> * Thu Jul 7 2016 Peter Robinson <pbrobinson@fedoraproject.org>
- Enable Marvell mvebu for aarch64 - Enable Marvell mvebu for aarch64