From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 20 Jun 2020 07:06:41 +0000 (+1000)
Subject: drm/nouveau/kms/nv50-: convert core caps_init() to new push macros
X-Git-Tag: v5.9-rc1~134^2~7^2~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c43c362b3a50a0e7d2cd5d6dc721a74d9e27694;p=thirdparty%2Fkernel%2Fstable.git

drm/nouveau/kms/nv50-: convert core caps_init() to new push macros

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

diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
index ce6f6494d445a..455509c74d488 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
@@ -66,15 +66,14 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset)
 int
 core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
 {
-	u32 *push = evo_wait(&disp->core->chan, 2);
+	struct nvif_push *push = disp->core->chan.push;
+	int ret;
 
-	if (push) {
-		evo_mthd(push, 0x008c, 1);
-		evo_data(push, 0x0);
-		evo_kick(push, &disp->core->chan);
-	}
+	if ((ret = PUSH_WAIT(push, 2)))
+		return ret;
 
-	return 0;
+	PUSH_NVSQ(push, NV507D, 0x008c, 0x00000000);
+	return PUSH_KICK(push);
 }
 
 int