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

Ben Skeggs · Ben Skeggs · commit 1fad04ceef14 · 2020-07-24T18:51:03.000+10:00
Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
Reviewed-by: Lyude Paul &lt;lyude@redhat.com&gt;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
@@ -81,7 +81,7 @@ crc907d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 	if ((ret = PUSH_WAIT(push, 2)))
 		return ret;
 
-	PUSH_NVSQ(push, NV907D, 0x0438 + (i * 0x300), ctx ? ctx->ntfy.handle : 0);
+	PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_CRC(i), ctx ? ctx->ntfy.handle : 0);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
@@ -85,7 +85,7 @@ crcc37d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 	if ((ret = PUSH_WAIT(push, 2)))
 		return ret;
 
-	PUSH_NVSQ(push, NVC37D, 0x2180 + (i * 0x400), ctx ? ctx->ntfy.handle : 0);
+	PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_CRC(i), ctx ? ctx->ntfy.handle : 0);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ crc907d_set_ctx(struct nv50_head head, struct nv50_crc_notifier_ctx ctx)`
`81`	`81`	`if ((ret = PUSH_WAIT(push, 2)))`
`82`	`82`	`return ret;`
`83`	`83`
`84`		`- PUSH_NVSQ(push, NV907D, 0x0438 + (i * 0x300), ctx ? ctx->ntfy.handle : 0);`
	`84`	`+ PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_CRC(i), ctx ? ctx->ntfy.handle : 0);`
`85`	`85`	`return 0;`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ crcc37d_set_ctx(struct nv50_head head, struct nv50_crc_notifier_ctx ctx)`
`85`	`85`	`if ((ret = PUSH_WAIT(push, 2)))`
`86`	`86`	`return ret;`
`87`	`87`
`88`		`- PUSH_NVSQ(push, NVC37D, 0x2180 + (i * 0x400), ctx ? ctx->ntfy.handle : 0);`
	`88`	`+ PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_CRC(i), ctx ? ctx->ntfy.handle : 0);`
`89`	`89`	`return 0;`
`90`	`90`	`}`
`91`	`91`