From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 9 Jan 2017 00:22:15 +0000 (+1000)
Subject: drm/nouveau/disp/mcp7x: disable dptmds workaround
X-Git-Tag: C0P2-H0.0--20200415~9328
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=9c0c4352726368fca2760b9b9a7d808ce86871c7;p=linux.git

drm/nouveau/disp/mcp7x: disable dptmds workaround

commit 7dfee6827780d4228148263545af936d0cae8930 upstream.

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@redhat.com>
Tested-by: Roy Spliet <nouveau@spliet.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index fbb8c7dc18fd..0d65e7f15451 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;