[linux] 04/04: drm/nouveau/disp/mcp7x: disable dptmds workaround (Closes: #850219)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 20a0659e2404a7e74da6997e927bdca5daa277a6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 7 20:42:59 2017 +0100

    drm/nouveau/disp/mcp7x: disable dptmds workaround (Closes: #850219)
---
 debian/changelog                                   |  1 +
 ...veau-disp-mcp7x-disable-dptmds-workaround.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0435ab9..4d0e56e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [s390x] Set NR_CPUS=256 (Closes: #858731)
   * [x86] usbip: Increase USBIP_VHCI_NR_HCS to 8 and USBIP_VHCI_HC_PORTS to 31
     (Closes: #859641)
+  * drm/nouveau/disp/mcp7x: disable dptmds workaround (Closes: #850219)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Mar 2017 18:27:30 +0100
 
diff --git a/debian/patches/bugfix/all/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch b/debian/patches/bugfix/all/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch
new file mode 100644
index 0000000..facdb84
--- /dev/null
+++ b/debian/patches/bugfix/all/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch
@@ -0,0 +1,28 @@
+From: Ben Skeggs <bskeggs at redhat.com>
+Date: Mon, 9 Jan 2017 10:22:15 +1000
+Subject: drm/nouveau/disp/mcp7x: disable dptmds workaround
+Origin: https://git.kernel.org/linus/7dfee6827780d4228148263545af936d0cae8930
+Bug-Debian: https://bugs.debian.org/850219
+
+The workaround appears to cause regressions on these boards, and from
+inspection of RM traces, NVIDIA don't appear to do it on them either.
+
+Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
+Tested-by: Roy Spliet <nouveau at spliet.org>
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+index 567466f93cd5..0db8efbf1c2e 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+@@ -433,8 +433,6 @@ nv50_disp_dptmds_war(struct nvkm_device *device)
+ 	case 0x94:
+ 	case 0x96:
+ 	case 0x98:
+-	case 0xaa:
+-	case 0xac:
+ 		return true;
+ 	default:
+ 		break;
diff --git a/debian/patches/series b/debian/patches/series
index 15dbe46..d59f122 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -88,6 +88,7 @@ bugfix/all/media-dvb-usb-don-t-use-stack-for-firmware-load.patch
 bugfix/all/media-dvb-usb-don-t-use-stack-for-reset-either.patch
 bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 bugfix/all/ACPI-EC-Use-busy-polling-mode-when-GPE-is-not-enable.patch
+bugfix/all/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch
 
 # Miscellaneous features
 features/all/netfilter-nft_ct-add-notrack-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git