From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 20 Jun 2020 07:59:39 +0000 (+1000)
Subject: drm/nouveau/kms/nv50-: use NVIDIA's headers for core wndw_owner()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8e650ecbcd5d769afa03618cb4c7f4a21498ecd5;p=linux.git

drm/nouveau/kms/nv50-: use NVIDIA's headers for core wndw_owner()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
index 796e847ca8747..9035d3ab062c4 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
@@ -40,8 +40,10 @@ corec37d_wndw_owner(struct nv50_core *core)
 	if ((ret = PUSH_WAIT(push, windows * 2)))
 		return ret;
 
-	for (i = 0; i < windows; i++)
-		PUSH_NVSQ(push, NVC37D, 0x1000 + (i * 0x080), i >> 1);
+	for (i = 0; i < windows; i++) {
+		PUSH_MTHD(push, NVC37D, WINDOW_SET_CONTROL(i),
+			  NVDEF(NVC37D, WINDOW_SET_CONTROL, OWNER, HEAD(i >> 1)));
+	}
 
 	return 0;
 }