diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-07-07 08:27:15 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-07-07 08:27:26 -0400 |
| commit | f9a99b63955feab476bb0e610538ed144d388269 (patch) | |
| tree | 6bd2e6a77919007b75e3a215e39d422d63514329 | |
| parent | a1ea56bdad1e65f094012a12301e21321eb4cb08 (diff) | |
| download | kernel-f9a99b63955feab476bb0e610538ed144d388269.tar.gz kernel-f9a99b63955feab476bb0e610538ed144d388269.tar.xz kernel-f9a99b63955feab476bb0e610538ed144d388269.zip | |
Fix blank screen on some nvidia cards (rbhz 1351205)
| -rw-r--r-- | drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch | 29 | ||||
| -rw-r--r-- | kernel.spec | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch b/drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch new file mode 100644 index 000000000..996b47918 --- /dev/null +++ b/drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch @@ -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; + } + diff --git a/kernel.spec b/kernel.spec index 17b74cb2d..126fe115a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -661,6 +661,9 @@ Patch831: nfsd-check-permissions-when-setting-ACLs.patch #CVE-2016-6156 rhbz 1353490 1353491 Patch832: platform-chrome-cros_ec_dev-double-fetch-bug-in-ioct.patch +#rbhz 1351205 +Patch833: drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch + # END OF PATCH DEFINITIONS %endif @@ -2179,6 +2182,7 @@ fi # %changelog * Thu Jul 07 2016 Josh Boyer <jwboyer@fedoraproject.org> +- Fix blank screen on some nvidia cards (rbhz 1351205) - CVE-2016-6156 race condition in chrome chardev driver (rhbz 1353490 1353491) * Tue Jul 05 2016 Josh Boyer <jwboyer@fedoraproject.org> |